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.

This back-patches commit eb9812f27 into out-of-support branches,
pursuant to newly-established project policy.  The point is to
suppress useless noise on stderr when running check-world.

Discussion: https://postgr.es/m/d0316012-ece7-7b7e-2d36-9c38cb77cb3b@enterprisedb.com

diff --git a/contrib/pg_upgrade/test.sh b/contrib/pg_upgrade/test.sh
index bf7e64d5bb00a3c0fce8b2bbf5664ec5350cccc7..d0a1c447e48446313adde3b2cd23ed913d6a132a 100644 (file)
--- a/contrib/pg_upgrade/test.sh
+++ b/contrib/pg_upgrade/test.sh
@@ -18,7 +18,8 @@ export PGPORT
 # Run a given "initdb" binary and overlay the regression testing
 # authentication configuration.
 standard_initdb() {
-   "$1"
+   # Specify "-A trust" explicitly to suppress initdb's warning.
+   "$1" -A trust
    if [ -n "$TEMP_CONFIG" -a -r "$TEMP_CONFIG" ]
    then
        cat "$TEMP_CONFIG" >> "$PGDATA/postgresql.conf"
@@ -126,9 +127,6 @@ logdir=`pwd`/log
 rm -rf "$logdir"
 mkdir "$logdir"
 
-# 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
 
@@ -200,10 +198,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