From 8d21512dc34f04c43a1a3d453967b88b2edcd8cc Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 22 Jul 2019 17:14:22 -0400 Subject: [PATCH] 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 b65039bddb..e65f3d04ef 100644 --- a/src/bin/pg_upgrade/test.sh +++ b/src/bin/pg_upgrade/test.sh @@ -22,7 +22,8 @@ unset MAKELEVEL standard_initdb() { # To increase coverage of non-standard segment size and group access # without increasing test runtime, run these tests with a custom setting. - "$1" -N --wal-segsize 1 -g + # Also, specify "-A trust" explicitly to suppress initdb's warning. + "$1" -N --wal-segsize 1 -g -A trust if [ -n "$TEMP_CONFIG" -a -r "$TEMP_CONFIG" ] then cat "$TEMP_CONFIG" >> "$PGDATA/postgresql.conf" @@ -162,9 +163,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 @@ -268,10 +266,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 -- 2.40.0