diff --git a/contrib/pg_upgrade/test.sh b/contrib/pg_upgrade/test.sh index e9d159e5e80b52ba61fa5c20895d57e5c288a2dc..41355cf5fdc320c857445fbdc3ecdc5c4affb179 100644 --- a/contrib/pg_upgrade/test.sh +++ b/contrib/pg_upgrade/test.sh @@ -17,6 +17,13 @@ export PGPORT testhost=`uname -s` +case $testhost in + MINGW*) LISTEN_ADDRESSES="localhost" ;; + *) LISTEN_ADDRESSES="" ;; +esac + +POSTMASTER_OPTS="-F -c listen_addresses=$LISTEN_ADDRESSES" + temp_root=$PWD/tmp_check if [ "$1" = '--install' ]; then @@ -71,10 +78,11 @@ logdir=$PWD/log rm -rf "$logdir" mkdir "$logdir" +# enable echo so the user can see what is being executed set -x $oldbindir/initdb -$oldbindir/pg_ctl start -l "$logdir/postmaster1.log" -w +$oldbindir/pg_ctl start -l "$logdir/postmaster1.log" -o "$POSTMASTER_OPTS" -w if "$MAKE" -C "$oldsrc" installcheck; then pg_dumpall -f "$temp_root"/dump1.sql || pg_dumpall1_status=$? if [ "$newsrc" != "$oldsrc" ]; then @@ -117,7 +125,7 @@ initdb pg_upgrade -d "${PGDATA}.old" -D "${PGDATA}" -b "$oldbindir" -B "$bindir" -pg_ctl start -l "$logdir/postmaster2.log" -w +pg_ctl start -l "$logdir/postmaster2.log" -o "$POSTMASTER_OPTS" -w case $testhost in MINGW*) cmd /c analyze_new_cluster.bat ;; @@ -126,6 +134,11 @@ esac pg_dumpall -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