From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Mon, 9 Oct 2006 01:45:57 +0000 (+0000)
Subject: Fix back-branch pg_regress scripts to try the "canonical" expected file if we
X-Git-Tag: REL7_4_14~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1bc5d5ddafe0fa8431020dcb32729098b110a72;p=thirdparty%2Fpostgresql.git

Fix back-branch pg_regress scripts to try the "canonical" expected file if we
tried a variant file from resultmap and it didn't match.  This is already done
in HEAD's C-code version, and is needed because OpenBSD has recently migrated
to a more standard handling of float underflow --- see buildfarm results
from emu.
---

diff --git a/src/test/regress/pg_regress.sh b/src/test/regress/pg_regress.sh
index 368fd2d5278..47f2cb91f38 100644
--- a/src/test/regress/pg_regress.sh
+++ b/src/test/regress/pg_regress.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.36.2.1 2005/07/17 18:29:37 tgl Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.36.2.2 2006/10/09 01:45:57 tgl Exp $
 
 me=`basename $0`
 : ${TMPDIR=/tmp}
@@ -629,7 +629,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 ]
@@ -639,13 +640,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=$?