diff options
Diffstat (limited to 'src')
| -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 66e69b946b4..598f4a1e11b 100644 --- a/src/bin/pg_upgrade/test.sh +++ b/src/bin/pg_upgrade/test.sh @@ -22,7 +22,8 @@ unset MAKELEVEL standard_initdb() { # To increase coverage of non-standard segment size and group access # without increasing test runtime, run these tests with a custom setting. - "$1" -N --wal-segsize 1 -g + # Also, specify "-A trust" explicitly to suppress initdb's warning. + "$1" -N --wal-segsize 1 -g -A trust if [ -n "$TEMP_CONFIG" -a -r "$TEMP_CONFIG" ] then cat "$TEMP_CONFIG" >> "$PGDATA/postgresql.conf" @@ -150,9 +151,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 @@ -256,10 +254,6 @@ esac pg_dumpall --no-sync -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 |