postgres.git / summary / log / commit / refs

commit    7ac7bf50cc9a7ecdeea683fd92e1a0e0c9e7cf19
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Mon Jul 22 21:14:22 2019 +0000

    Make pg_upgrade's test.sh less chatty.
    
    Remove "set -x", and pass "-A trust" to initdb explicitly,
    to suppress almost all of the noise this script used to emit
    on stderr.
    
    Back-patch of commit eb9812f27 into all active branches.
    
    Discussion: https://postgr.es/m/21766.1558397960@sss.pgh.pa.us
    Discussion: https://postgr.es/m/20190722193459.GA14241@alvherre.pgsql


 src/bin/pg_upgrade/test.sh | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh
index ae520ff6200..5e14ede712d 100644
--- a/src/bin/pg_upgrade/test.sh
+++ b/src/bin/pg_upgrade/test.sh
@@ -20,7 +20,8 @@ unset MAKELEVEL
 # Run a given "initdb" binary and overlay the regression testing
 # authentication configuration.
 standard_initdb() {
-	"$1" -N
+	# Specify "-A trust" explicitly to suppress initdb's warning.
+	"$1" -N -A trust
 	if [ -n "$TEMP_CONFIG" -a -r "$TEMP_CONFIG" ]
 	then
 		cat "$TEMP_CONFIG" >> "$PGDATA/postgresql.conf"
@@ -160,9 +161,6 @@ done
 EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --port=$PGPORT"
 export EXTRA_REGRESS_OPTS
 
-# enable echo so the user can see what is being executed
-set -x
-
 standard_initdb "$oldbindir"/initdb
 "$oldbindir"/pg_ctl start -l "$logdir/postmaster1.log" -o "$POSTMASTER_OPTS" -w
 
@@ -248,10 +246,6 @@ esac
 pg_dumpall --no-sync -f "$temp_root"/dump2.sql || pg_dumpall2_status=$?
 pg_ctl -m fast stop
 
-# no need to echo commands anymore
-set +x
-echo
-
 if [ -n "$pg_dumpall2_status" ]; then
 	echo "pg_dumpall of post-upgrade database cluster failed"
 	exit 1


[parent: 0e1deaa4c424]