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[email protected]

diff --git a/contrib/pg_upgrade/test.sh b/contrib/pg_upgrade/test.sh
index 5062ff0ea67b13600e0fa52abecbd04be9ac170f..c454c1ca72e13a4b516677771b53fbda00a0c446 100644 (file)
--- a/contrib/pg_upgrade/test.sh
+++ b/contrib/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"
@@ -148,9 +149,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
 
@@ -222,10 +220,6 @@ esac
 pg_dumpall -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