sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-06 00:02:36 -04:00
Code Issues Projects Releases Wiki Activity

Win32 regression fixes:

Browse Source 
. only use the -W flag on pwd for $pkglibdir. All the other paths need
to be seen as MSys type paths, whereas $pkglibdir needs to be expressed
as a genuine windows path.
. run single tests in the background and explicitly wait for them -
solves the problem of the MSys shell not waiting properly for the copy
test to finish.
. use pg_ctl to shut down the test postmaster - no more use of ad hoc
kill programs or the task manager.

Andrew Dunstan
This commit is contained in:
Bruce Momjian 2004-06-03 00:25:47 +00:00
parent 3c45d348db
commit 473ac70aca
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/test/regress/pg_regress.sh
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.44 2004/05/20 00:21:36 momjian Exp $ # $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.45 2004/06/03 00:25:47 momjian Exp $
me=`basename $0` me=`basename $0`
: ${TMPDIR=/tmp} : ${TMPDIR=/tmp}
@ -207,18 +207,6 @@ case $host_platform in
esac esac
# ----------
# Set up pwd to give a win32 happy pathname
# ----------
case $host_platform in
*-*-mingw32*)
PWDFLAGS=-W;;
*)
PWDFLAGS=;;
esac
# ---------- # ----------
# Set backend timezone and datestyle explicitly # Set backend timezone and datestyle explicitly
# #
@ -306,12 +294,20 @@ LOGDIR=$outputdir/log
if [ x"$temp_install" != x"" ] if [ x"$temp_install" != x"" ]
then then
if echo x"$temp_install" | grep -v '^x/' >/dev/null 2>&1; then if echo x"$temp_install" | grep -v '^x/' >/dev/null 2>&1; then
temp_install="`pwd $PWDFLAGS`/$temp_install" case $host_platform in
*-*-mingw32*)
pkglibdir="`pwd -W`/$temp_install/install/$pkglibdir"
temp_install="`pwd`/$temp_install"
;;
*)
temp_install="`pwd`/$temp_install"
pkglibdir=$temp_install/install/$pkglibdir
;;
esac
fi fi
bindir=$temp_install/install/$bindir bindir=$temp_install/install/$bindir
libdir=$temp_install/install/$libdir libdir=$temp_install/install/$libdir
pkglibdir=$temp_install/install/$pkglibdir
datadir=$temp_install/install/$datadir datadir=$temp_install/install/$datadir
PGDATA=$temp_install/data PGDATA=$temp_install/data
@ -602,7 +598,8 @@ do
# Run a single test # Run a single test
formatted=`echo $1 | awk '{printf "%-20.20s", $1;}'` formatted=`echo $1 | awk '{printf "%-20.20s", $1;}'`
$ECHO_N "test $formatted ... $ECHO_C" $ECHO_N "test $formatted ... $ECHO_C"
$PSQL -d "$dbname" <"$inputdir/sql/$1.sql" >"$outputdir/results/$1.out" 2>&1 ( $PSQL -d "$dbname" <"$inputdir/sql/$1.sql" >"$outputdir/results/$1.out" 2>&1 )&
wait
else else
# Start a parallel group # Start a parallel group
$ECHO_N "parallel group ($# tests): $ECHO_C" $ECHO_N "parallel group ($# tests): $ECHO_C"
@ -704,7 +701,7 @@ done | tee "$result_summary_file" 2>&1
if [ -n "$postmaster_pid" ]; then if [ -n "$postmaster_pid" ]; then
message "shutting down postmaster" message "shutting down postmaster"
kill -15 "$postmaster_pid" "$bindir/pg_ctl" -s -D "$PGDATA" stop
wait "$postmaster_pid" wait "$postmaster_pid"
unset postmaster_pid unset postmaster_pid
fi fi