diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/regress/pg_regress.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/test/regress/pg_regress.sh b/src/test/regress/pg_regress.sh index 67d89215d0d..5bb31f71095 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.61 2005/11/01 15:09:11 adunstan Exp $ +# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.61.2.1 2006/10/09 01:45:41 tgl Exp $ me=`basename $0` : ${TMPDIR=/tmp} @@ -675,7 +675,8 @@ do # to a system-specific expected file. # There shouldn't be multiple matches, but take the last if there are. - EXPECTED="$inputdir/expected/${name}" + STDEXPECTED="$inputdir/expected/${name}" + EXPECTED="$STDEXPECTED" for LINE in $SUBSTLIST do if [ `expr "$LINE" : "$name="` -ne 0 ] @@ -685,13 +686,14 @@ do fi done - # If there are multiple equally valid result files, loop to get the right one. + # If there are multiple equally valid result files, + # loop to get the right one. # If none match, diff against the closest one. bestfile= bestdiff= result=2 - for thisfile in $EXPECTED.out ${EXPECTED}_[0-9].out; do + for thisfile in $EXPECTED.out ${EXPECTED}_[0-9].out $STDEXPECTED.out; do [ ! -r "$thisfile" ] && continue diff $DIFFFLAGS $thisfile $outputdir/results/${name}.out >/dev/null 2>&1 result=$? |