From 3d32b17798a2852ea7dd66115e6558a0095aaaac Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 9 Oct 2006 01:45:49 +0000 Subject: [PATCH] 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. --- src/test/regress/pg_regress.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/test/regress/pg_regress.sh b/src/test/regress/pg_regress.sh index f3498d772f..d62afddf18 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.53.4.3 2006/06/19 14:25:01 tgl Exp $ +# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.53.4.4 2006/10/09 01:45:49 tgl Exp $ me=`basename $0` : ${TMPDIR=/tmp} @@ -680,7 +680,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 ] @@ -690,13 +691,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=$?