Commitf61013a

committed

Use a more portable platform test.

1 parente7bab08 commitf61013aCopy full SHA for f61013a

File tree

+10

-11

lines changed

+10

-11

lines changed

Lines changed: 10 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ set -e`
`15`	`15`	`:${PGPORT=50432}`
`16`	`16`	`export PGPORT`
`17`	`17`
`18`		-testhost=`uname -o`
	`18`	+testhost=`uname -s`
`19`	`19`
`20`	`20`	`temp_root=$PWD/tmp_check`
`21`	`21`
`@@ -110,23 +110,22 @@ pg_upgrade -d "${PGDATA}.old" -D "${PGDATA}" -b "$oldbindir" -B "$bindir"`
`110`	`110`
`111`	`111`	`pg_ctl start -l"$logdir/postmaster2.log" -w`
`112`	`112`
`113`		`-if [$testhost= Msys ];then`
`114`		`-cmd /c analyze_new_cluster.bat`
`115`		`-else`
`116`		`-sh ./analyze_new_cluster.sh`
`117`		`-fi`
	`113`	`+case$testhostin`
	`114`	`+MINGW*)cmd /c analyze_new_cluster.bat ;;`
	`115`	`+*)sh ./analyze_new_cluster.sh ;;`
	`116`	`+esac`
	`117`	`+`
`118`	`118`	`pg_dumpall -f"$temp_root"/dump2.sql\|\| pg_dumpall2_status=$?`
`119`	`119`	`pg_ctl -m fast stop`
`120`	`120`	`if [-n"$pg_dumpall2_status" ];then`
`121`	`121`	`echo"pg_dumpall of post-upgrade database cluster failed"`
`122`	`122`	`exit 1`
`123`	`123`	`fi`
`124`	`124`
`125`		`-if [$testhost= Msys ];then`
`126`		`-cmd /c delete_old_cluster.bat`
`127`		`-else`
`128`		`-sh ./delete_old_cluster.sh`
`129`		`-fi`
	`125`	`+case$testhostin`
	`126`	`+MINGW*)cmd /c delete_old_cluster.bat ;;`
	`127`	`+*) sh ./delete_old_cluster.sh ;;`
	`128`	`+esac`
`130`	`129`
`131`	`130`	`if diff -q"$temp_root"/dump1.sql"$temp_root"/dump2.sql;then`
`132`	`131`	`echo PASSED`

Comments

(0)