8000 Make pg_upgrade's test.sh less chatty. · postgres/postgres@a4061ee · GitHub
[go: up one dir, main page]
Skip to content

Commit a4061ee

Browse files
tglsfdctglsfdc
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 emit on stderr. This back-patches commit eb9812f into out-of-support branches, pursuant to newly-established project policy. The point is to suppress useless noise on stderr when running check-world. Discussion: https://postgr.es/m/d0316012-ece7-7b7e-2d36-9c38cb77cb3b@enterprisedb.com
1 parent 70c6413 commit a4061ee

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

‎contrib/pg_upgrade/test.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ export PGPORT
1818
# Run a given "initdb" binary and overlay the regression testing
1919
# authentication configuration.
2020
standard_initdb() {
21-
"$1"
21+
# Specify "-A trust" explicitly to suppress initdb's warning.
22+
"$1" -A trust
2223
if [ -n "$TEMP_CONFIG" -a -r "$TEMP_CONFIG" ]
2324
then
2425
cat "$TEMP_CONFIG" >> "$PGDATA/postgresql.conf"
@@ -126,9 +127,6 @@ logdir=`pwd`/log
126127
rm -rf "$logdir"
127128
mkdir "$logdir"
128129

129-
# enable echo so the user can see what is being executed
130-
set -x
131-
132130
standard_initdb "$oldbindir"/initdb
133131
$oldbindir/pg_ctl start -l "$logdir/postmaster1.log" -o "$POSTMASTER_OPTS" -w
134132

@@ -200,10 +198,6 @@ esac
200198
pg_dumpall -f "$temp_root"/dump2.sql || pg_dumpall2_status=$?
201199
pg_ctl -m fast stop
202200

203-
# no need to echo commands anymore
204-
set +x
205-
echo
206-
207201
if [ -n "$pg_dumpall2_status" ]; then
208202
echo "pg_dumpall of post-upgrade database cluster failed"
209203
exit 1

0 commit comments

Comments
 (0)
0