Commit8d21512

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 parent6cdefc8 commit8d21512Copy full SHA for 8d21512

File tree

-8

lines changed

-8

lines changed

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@ unset MAKELEVEL`
`22`	`22`	`standard_initdb() {`
`23`	`23`	`# To increase coverage of non-standard segment size and group access`
`24`	`24`	`# without increasing test runtime, run these tests with a custom setting.`
`25`		`-"$1" -N --wal-segsize 1 -g`
	`25`	`+# Also, specify "-A trust" explicitly to suppress initdb's warning.`
	`26`	`+"$1" -N --wal-segsize 1 -g -A trust`
`26`	`27`	`if [-n"$TEMP_CONFIG"-a-r"$TEMP_CONFIG" ]`
`27`	`28`	`then`
`28`	`29`	`cat"$TEMP_CONFIG">>"$PGDATA/postgresql.conf"`
`@@ -162,9 +163,6 @@ done`
`162`	`163`	`EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --port=$PGPORT"`
`163`	`164`	`export EXTRA_REGRESS_OPTS`
`164`	`165`
`165`		`-# enable echo so the user can see what is being executed`
`166`		`-set -x`
`167`		`-`
`168`	`166`	`standard_initdb"$oldbindir"/initdb`
`169`	`167`	`"$oldbindir"/pg_ctl start -l"$logdir/postmaster1.log" -o"$POSTMASTER_OPTS" -w`
`170`	`168`
`@@ -268,10 +266,6 @@ esac`
`268`	`266`	`pg_dumpall --no-sync -f"$temp_root"/dump2.sql\|\| pg_dumpall2_status=$?`
`269`	`267`	`pg_ctl -m fast stop`
`270`	`268`
`271`		`-# no need to echo commands anymore`
`272`		`-set +x`
`273`		`-echo`
`274`		`-`
`275`	`269`	`if [-n"$pg_dumpall2_status" ];then`
`276`	`270`	`echo"pg_dumpall of post-upgrade database cluster failed"`
`277`	`271`	`exit 1`

Comments

(0)