Commit7ac7bf5

committed

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 emiton stderr.Back-patch of commiteb9812f into all active branches.Discussion:https://postgr.es/m/21766.1558397960@sss.pgh.pa.usDiscussion:https://postgr.es/m/20190722193459.GA14241@alvherre.pgsql

1 parent0e1deaa commit7ac7bf5Copy full SHA for 7ac7bf5

File tree

-8

lines changed

-8

lines changed

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,8 @@ unset MAKELEVEL`
`20`	`20`	`# Run a given "initdb" binary and overlay the regression testing`
`21`	`21`	`# authentication configuration.`
`22`	`22`	`standard_initdb() {`
`23`		`-"$1" -N`
	`23`	`+# Specify "-A trust" explicitly to suppress initdb's warning.`
	`24`	`+"$1" -N -A trust`
`24`	`25`	`if [-n"$TEMP_CONFIG"-a-r"$TEMP_CONFIG" ]`
`25`	`26`	`then`
`26`	`27`	`cat"$TEMP_CONFIG">>"$PGDATA/postgresql.conf"`
`@@ -160,9 +161,6 @@ done`
`160`	`161`	`EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --port=$PGPORT"`
`161`	`162`	`export EXTRA_REGRESS_OPTS`
`162`	`163`
`163`		`-# enable echo so the user can see what is being executed`
`164`		`-set -x`
`165`		`-`
`166`	`164`	`standard_initdb"$oldbindir"/initdb`
`167`	`165`	`"$oldbindir"/pg_ctl start -l"$logdir/postmaster1.log" -o"$POSTMASTER_OPTS" -w`
`168`	`166`
`@@ -248,10 +246,6 @@ esac`
`248`	`246`	`pg_dumpall --no-sync -f"$temp_root"/dump2.sql\|\| pg_dumpall2_status=$?`
`249`	`247`	`pg_ctl -m fast stop`
`250`	`248`
`251`		`-# no need to echo commands anymore`
`252`		`-set +x`
`253`		`-echo`
`254`		`-`
`255`	`249`	`if [-n"$pg_dumpall2_status" ];then`
`256`	`250`	`echo"pg_dumpall of post-upgrade database cluster failed"`
`257`	`251`	`exit 1`

Comments

(0)