Commit e442b0f0 authored by Andrew Dunstan's avatar Andrew Dunstan

Allow pg_upgrade "make check" to run on Windows/MSys.

Backpatch to 9.2.
parent a80b8037
...@@ -15,6 +15,8 @@ set -e ...@@ -15,6 +15,8 @@ set -e
: ${PGPORT=50432} : ${PGPORT=50432}
export PGPORT export PGPORT
testhost=`uname -o`
temp_root=$PWD/tmp_check temp_root=$PWD/tmp_check
if [ "$1" = '--install' ]; then if [ "$1" = '--install' ]; then
...@@ -107,7 +109,12 @@ initdb ...@@ -107,7 +109,12 @@ initdb
pg_upgrade -d "${PGDATA}.old" -D "${PGDATA}" -b "$oldbindir" -B "$bindir" 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" -w
sh ./analyze_new_cluster.sh
if [ $testhost = Msys ] ; then
cmd /c analyze_new_cluster.bat
else
sh ./analyze_new_cluster.sh
fi
pg_dumpall >"$temp_root"/dump2.sql || pg_dumpall2_status=$? pg_dumpall >"$temp_root"/dump2.sql || pg_dumpall2_status=$?
pg_ctl -m fast stop pg_ctl -m fast stop
if [ -n "$pg_dumpall2_status" ]; then if [ -n "$pg_dumpall2_status" ]; then
...@@ -115,7 +122,15 @@ if [ -n "$pg_dumpall2_status" ]; then ...@@ -115,7 +122,15 @@ if [ -n "$pg_dumpall2_status" ]; then
exit 1 exit 1
fi fi
sh ./delete_old_cluster.sh if [ $testhost = Msys ] ; then
cmd /c delete_old_cluster.bat
else
sh ./delete_old_cluster.sh
fi
if [ $testhost = Msys ] ; then
dos2unix "$temp_root"/dump1.sql "$temp_root"/dump2.sql
fi
if diff -q "$temp_root"/dump1.sql "$temp_root"/dump2.sql; then if diff -q "$temp_root"/dump1.sql "$temp_root"/dump2.sql; then
echo PASSED echo PASSED
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment