Undo Jan's typo that broke regress.sh's detection of systemREL6_5

type name.

1 files changed, 10 insertions, 8 deletions

diff --git a/src/test/regress/regress.sh b/src/test/regress/regress.sh
index 084d435744..b316308454 100755
--- a/src/test/regress/regress.sh
+++ b/src/test/regress/regress.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.29 1999/06/10 17:49:30 wieck Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.30 1999/06/14 17:49:06 tgl Exp $
 #
 if [ $# -eq 0 ]
 then
@@ -7,15 +7,16 @@ then
 	exit 1
 fi
 
-if [ $1 = "win" ]
+portname=$1
+shift
+extratests="$*"
+
+if [ x$portname = "xwin" ]
 then
 	HOST="-h localhost"
 else
 	HOST=""
 fi
-portname=$1
-export portname
-shift
 
 if echo '\c' | grep -s c >/dev/null 2>&1
 then
@@ -36,7 +37,7 @@ PGDATESTYLE="Postgres,US"; export PGDATESTYLE
 #FRONTEND=monitor
 FRONTEND="psql $HOST -n -e -q"
 
-SYSTEM=`../../config.guess | awk -F\- '{ split($3,a,/[0-9]/); printf"%s-%s", $portname, a[1] }'`
+SYSTEM=`../../config.guess | awk -F\- '{ split($3,a,/[0-9]/); printf"%s-%s", $1, a[1] }'`
 
 echo "=============== Notes...                              ================="
 echo "postmaster must already be running for the regression tests to succeed."
@@ -75,7 +76,7 @@ fi
 
 echo "=============== running regression queries...         ================="
 echo "" > regression.diffs
-for i in `cat sql/tests` $mbtests $*
+for i in `cat sql/tests` $mbtests $extratests
 do
 	$ECHO_N "${i} .. " $ECHO_C
 	$FRONTEND regression < sql/${i}.sql > results/${i}.out 2>&1
@@ -97,7 +98,8 @@ do
 		echo ok
 	fi
 done
-exit
+
+exit 0
 
 echo "=============== running error queries ...             ================="
 $FRONTEND regression < errors.sql