diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2019-07-22 17:14:22 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2019-07-22 17:14:22 -0400 |
| commit | 69c3d519112f8c62a94b680351e40496a653fac8 (patch) | |
| tree | 1893e576946f8a118adf06ad3ded037df9ff31c4 | |
| parent | caa22d72a5f0745034e980784d92bc541927e631 (diff) | |
| download | postgresql-69c3d519112f8c62a94b680351e40496a653fac8.tar.gz postgresql-69c3d519112f8c62a94b680351e40496a653fac8.zip | |
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
| -rw-r--r-- | src/bin/pg_upgrade/test.sh | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh index 8a8b826e9d9..3f98158dde3 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" @@ -158,9 +159,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 @@ -232,10 +230,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 |