Commit19f9a5a

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 parent847561c commit19f9a5aCopy full SHA for 19f9a5a

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"`
`@@ -148,9 +149,6 @@ done`
`148`	`149`	`EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --port=$PGPORT"`
`149`	`150`	`export EXTRA_REGRESS_OPTS`
`150`	`151`
`151`		`-# enable echo so the user can see what is being executed`
`152`		`-set -x`
`153`		`-`
`154`	`152`	`standard_initdb"$oldbindir"/initdb`
`155`	`153`	`$oldbindir/pg_ctl start -l"$logdir/postmaster1.log" -o"$POSTMASTER_OPTS" -w`
`156`	`154`
`@@ -222,10 +220,6 @@ esac`
`222`	`220`	`pg_dumpall -f"$temp_root"/dump2.sql\|\| pg_dumpall2_status=$?`
`223`	`221`	`pg_ctl -m fast stop`
`224`	`222`
`225`		`-# no need to echo commands anymore`
`226`		`-set +x`
`227`		`-echo`
`228`		`-`
`229`	`223`	`if [-n"$pg_dumpall2_status" ];then`
`230`	`224`	`echo"pg_dumpall of post-upgrade database cluster failed"`
`231`	`225`	`exit 1`

Comments

(0)