diff options
| author | Bruce Momjian <bruce@momjian.us> | 2004-05-02 04:27:37 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2004-05-02 04:27:37 +0000 |
| commit | 14a5330806c101bf8817ea4f3fbf8d59da6f8050 (patch) | |
| tree | 7d7e490c428317fc90e701846f6cf08ef6202580 /src | |
| parent | 3363b847ec35435e796dd18b41681c8d3dac8770 (diff) | |
this patch makes sure that:
* correct platform specific regression files are used under ming
* pwd prints out a usable win32 pathname
Claudio Natoli
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/regress/pg_regress.sh | 16 | ||||
| -rw-r--r-- | src/test/regress/resultmap | 6 |
2 files changed, 17 insertions, 5 deletions
diff --git a/src/test/regress/pg_regress.sh b/src/test/regress/pg_regress.sh index 660d5493959..542aa0cc3ba 100644 --- a/src/test/regress/pg_regress.sh +++ b/src/test/regress/pg_regress.sh @@ -1,5 +1,5 @@ #! /bin/sh -# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.38 2004/01/08 20:04:41 neilc Exp $ +# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.39 2004/05/02 04:27:37 momjian Exp $ me=`basename $0` : ${TMPDIR=/tmp} @@ -208,6 +208,18 @@ 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 # # To pass the horology test in its current form, the postmaster must be @@ -294,7 +306,7 @@ LOGDIR=$outputdir/log if [ x"$temp_install" != x"" ] then if echo x"$temp_install" | grep -v '^x/' >/dev/null 2>&1; then - temp_install="`pwd`/$temp_install" + temp_install="`pwd $PWDFLAGS`/$temp_install" fi bindir=$temp_install/install/$bindir diff --git a/src/test/regress/resultmap b/src/test/regress/resultmap index 940e052ae88..52b47e593b3 100644 --- a/src/test/regress/resultmap +++ b/src/test/regress/resultmap @@ -7,12 +7,12 @@ abstime/sparc-sun-solaris=abstime-solaris-1947 abstime/.*-sco=abstime-solaris-1947 abstime/.*-sysv5=abstime-solaris-1947 float4/.*-qnx=float4-exp-three-digits -float4/win32=float4-exp-three-digits +float4/i.86-pc-mingw32=float4-exp-three-digits float8/i.86-.*-freebsd[234]=float8-small-is-zero float8/i.86-.*-openbsd=float8-small-is-zero float8/i.86-.*-netbsd=float8-small-is-zero float8/.*-qnx=float8-exp-three-digits -float8/win32=float8-exp-three-digits-win32 +float8/i.86-pc-mingw32=float8-exp-three-digits-win32 float8/i.86-pc-cygwin=float8-small-is-zero horology/.*-aix4=horology-solaris-1947 horology/.*-aix5=horology-solaris-1947 @@ -26,7 +26,7 @@ horology/sparc-sun-sunos4.*=horology-no-DST-before-1970 horology/.*-sysv5=horology-solaris-1947 horology/.*-sco=horology-solaris-1947 int8/.*-qnx=int8-exp-three-digits -int8/win32=int8-exp-three-digits-win32 +int8/i.86-pc-mingw32=int8-exp-three-digits-win32 tinterval/.*-aix4=tinterval-solaris-1947 tinterval/.*-aix5=tinterval-solaris-1947 tinterval/alpha.*-dec-osf=tinterval-solaris-1947 |