Skip to content

Commit 275a1d0

Browse files
committed
Undo Jan's typo that broke regress.sh's detection of system
type name.
1 parent 1b93294 commit 275a1d0

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

src/test/regress/regress.sh

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
#!/bin/sh
2-
# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.29 1999/06/10 17:49:30 wieck Exp $
2+
# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.30 1999/06/14 17:49:06 tgl Exp $
33
#
44
if [ $# -eq 0 ]
55
then
66
echo "Syntax: $0 <portname> [extra-tests]"
77
exit 1
88
fi
99

10-
if [ $1 = "win" ]
10+
portname=$1
11+
shift
12+
extratests="$*"
13+
14+
if [ x$portname = "xwin" ]
1115
then
1216
HOST="-h localhost"
1317
else
1418
HOST=""
1519
fi
16-
portname=$1
17-
export portname
18-
shift
1920

2021
if echo '\c' | grep -s c >/dev/null 2>&1
2122
then
@@ -36,7 +37,7 @@ PGDATESTYLE="Postgres,US"; export PGDATESTYLE
3637
#FRONTEND=monitor
3738
FRONTEND="psql $HOST -n -e -q"
3839

39-
SYSTEM=`../../config.guess | awk -F\- '{ split($3,a,/[0-9]/); printf"%s-%s", $portname, a[1] }'`
40+
SYSTEM=`../../config.guess | awk -F\- '{ split($3,a,/[0-9]/); printf"%s-%s", $1, a[1] }'`
4041

4142
echo "=============== Notes... ================="
4243
echo "postmaster must already be running for the regression tests to succeed."
@@ -75,7 +76,7 @@ fi
7576

7677
echo "=============== running regression queries... ================="
7778
echo "" > regression.diffs
78-
for i in `cat sql/tests` $mbtests $*
79+
for i in `cat sql/tests` $mbtests $extratests
7980
do
8081
$ECHO_N "${i} .. " $ECHO_C
8182
$FRONTEND regression < sql/${i}.sql > results/${i}.out 2>&1
@@ -97,7 +98,8 @@ do
9798
echo ok
9899
fi
99100
done
100-
exit
101+
102+
exit 0
101103

102104
echo "=============== running error queries ... ================="
103105
$FRONTEND regression < errors.sql

0 commit comments

Comments
 (0)