New scheme for managing platform-specific regress test result files.

Instead of hard-wiring one result file per platform, there is a map file
'resultmap' that says which one to use --- a lot like template/.similar.
I have only created entries in resultmap for my own platform (HPUX) so
far; feel free to add lines for other platforms.

src/GNUmakefile.in

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.46 1999/12/04 04:34:56 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.47 2000/01/09 07:53:52 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -104,7 +104,8 @@ distclean: clean
 		interfaces/odbc/Makefile.global \
 		pl/plpgsql/src/Makefile \
 		pl/plpgsql/src/mklang.sql \
-		pl/tcl/mkMakefile.tcldefs.sh
+		pl/tcl/mkMakefile.tcldefs.sh \
+		test/regress/GNUmakefile
 
 .DEFAULT:
 	$(MAKE) -C lextest $@

src/configure

@@ -7924,6 +7924,7 @@ trap 'rm -fr `echo "GNUmakefile
 	pl/plpgsql/src/Makefile
 	pl/plpgsql/src/mklang.sql
 	pl/tcl/mkMakefile.tcldefs.sh
+	test/regress/GNUmakefile
  include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -8098,6 +8099,7 @@ CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile
 	pl/plpgsql/src/Makefile
 	pl/plpgsql/src/mklang.sql
 	pl/tcl/mkMakefile.tcldefs.sh
+	test/regress/GNUmakefile
 "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF

src/configure.in

@@ -1250,4 +1250,5 @@ AC_OUTPUT(
 	pl/plpgsql/src/Makefile
 	pl/plpgsql/src/mklang.sql
 	pl/tcl/mkMakefile.tcldefs.sh
+	test/regress/GNUmakefile
 )

src/test/regress/GNUmakefile → src/test/regress/GNUmakefile.in

 #-------------------------------------------------------------------------
 #
-# Makefile--
-#    Makefile for regress (the regression test)
+# GNUmakefile--
+#    Makefile for regress (the regression tests)
 #
 # Copyright (c) 1994, Regents of the University of California
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.20 1999/11/19 18:51:48 wieck Exp $
+#    $Header: /cvsroot/pgsql/src/test/regress/Attic/GNUmakefile.in,v 1.1 2000/01/09 07:53:58 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR= ../..
-include ../../Makefile.global
+include $(SRCDIR)/Makefile.global
 
-CFLAGS+= -I$(LIBPQDIR) -I../../include $(CFLAGS_SL)
+CONTRIB= $(SRCDIR)/../contrib
+
+HOST= @host@
+
+CFLAGS+= -I$(LIBPQDIR) -I$(SRCDIR)/include $(CFLAGS_SL)
 
 LDADD+= -L$(LIBPQDIR) -lpq
         
@@ -43,17 +47,17 @@ endif
 EXTRA_TESTS	= numeric_big
 
 #
-# prepare to run the test (including clean-up after the last run)
+# prepare to run the tests
 #
 all: $(INFILES)
 	cd input; $(MAKE) all; cd ..
 	cd output; $(MAKE) all; cd ..
 #ifneq ($(PORTNAME), win)
-	$(MAKE) -C ../../../contrib/spi REFINT_VERBOSE=1 refint$(DLSUFFIX) \
-	autoinc$(DLSUFFIX)
+	$(MAKE) -C $(CONTRIB)/spi REFINT_VERBOSE=1 \
+	refint$(DLSUFFIX) autoinc$(DLSUFFIX)
 #else
-#	cat /dev/null > ../../../contrib/spi/refint$(DLSUFFIX)
-#	cat /dev/null > ../../../contrib/spi/autoinc$(DLSUFFIX)
+#	cat /dev/null > $(CONTRIB)/spi/refint$(DLSUFFIX)
+#	cat /dev/null > $(CONTRIB)/spi/autoinc$(DLSUFFIX)
 #endif
 
 #ifeq ($(PORTNAME), win)
@@ -62,15 +66,15 @@ all: $(INFILES)
 #endif
 
 #
-# run the test
+# run the tests
 #
 runtest: $(INFILES) 
 ifneq ($(PORTNAME), win)
 	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
-	$(SHELL) ./regress.sh $(PORTNAME) 2>&1 | tee regress.out
+	$(SHELL) ./regress.sh $(HOST) 2>&1 | tee regress.out
 else
 	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
-	./regress.sh $(PORTNAME) 2>&1 | tee regress.out
+	./regress.sh $(HOST) 2>&1 | tee regress.out
 endif
 	@echo "ACTUAL RESULTS OF REGRESSION TEST ARE NOW IN FILE regress.out"
 	@echo ""
@@ -84,10 +88,10 @@ endif
 bigtest: $(INFILES) 
 ifneq ($(PORTNAME), win)
 	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
-	$(SHELL) ./regress.sh $(PORTNAME) $(EXTRA_TESTS) 2>&1 | tee regress.out
+	$(SHELL) ./regress.sh $(HOST) $(EXTRA_TESTS) 2>&1 | tee regress.out
 else
 	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
-	./regress.sh $(PORTNAME) $(EXTRA_TESTS) 2>&1 | tee regress.out
+	./regress.sh $(HOST) $(EXTRA_TESTS) 2>&1 | tee regress.out
 endif
 	@echo "ACTUAL RESULTS OF REGRESSION TEST ARE NOW IN FILE regress.out"
 
@@ -97,10 +101,10 @@ endif
 runcheck:	$(INFILES)
 ifneq ($(PORTNAME), win)
 	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
-	$(SHELL) ./run_check.sh $(PORTNAME)
+	$(SHELL) ./run_check.sh $(HOST)
 else
 	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
-	./run_check.sh $(PORTNAME)
+	./run_check.sh $(HOST)
 endif
 	@echo "ACTUAL RESULTS OF REGRESSION TEST ARE NOW IN FILES run_check.out"
 	@echo "AND regress.out"
@@ -115,21 +119,21 @@ endif
 bigcheck: $(INFILES) 
 ifneq ($(PORTNAME), win)
 	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
-	$(SHELL) ./run_check.sh $(PORTNAME) $(EXTRA_TESTS)
+	$(SHELL) ./run_check.sh $(HOST) $(EXTRA_TESTS)
 else
 	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
-	./run_check.sh $(PORTNAME) $(EXTRA_TESTS)
+	./run_check.sh $(HOST) $(EXTRA_TESTS)
 endif
 	@echo "ACTUAL RESULTS OF REGRESSION TEST ARE NOW IN FILES run_check.out"
 	@echo "AND regress.out"
 
 clean:
-	rm -f $(INFILES) regress.out regress.o regression.diffs
+	rm -f $(INFILES) regress.out run_check.out regress.o regression.diffs
 ifeq ($(PORTNAME), win)
 	rm -f regress.def
 endif
 	$(MAKE) -C sql clean
 	$(MAKE) -C expected clean
 	$(MAKE) -C results clean
-	$(MAKE) -C ../../../contrib/spi clean
+	$(MAKE) -C $(CONTRIB)/spi clean
 	rm -rf tmp_check

src/test/regress/README

@@ -2,13 +2,11 @@
 Introduction
 
   The PostgreSQL regression tests are a comprehensive set of tests for the
-  SQL implementation embedded in PostgreSQL developed by Jolly Chen and
-  Andrew Yu. It tests standard SQL operations as well as the extensibility
-  capabilities of PostgreSQL.
+  SQL implementation embedded in PostgreSQL.  They test standard SQL
+  operations as well as the extensibility capabilities of PostgreSQL.
 
-  These tests have recently been revised by Marc Fournier and Thomas Lockhart
-  to become current for PostgreSQL v6.1. The tests are now packaged as
-  functional units and should be easier to run and easier to interpret.
+  The regression tests were originally developed by Jolly Chen and Andrew Yu,
+  and were extensively revised/repackaged by Marc Fournier and Thomas Lockhart.
 
   Some properly installed and fully functional PostgreSQL installations
   can fail some of these regression tests due to artifacts of floating point
@@ -19,12 +17,11 @@ Introduction
 
 Preparation
 
-  The regression test is invoked by the 'make' command which compiles
-  a 'c' program with PostgreSQL extension functions into a shared library
-  in the current directory.  Localized shell scripts are also created in
-  the current directory. The output file templates are massaged into the
-  ./expected/*.out files.  The localization replaces macros in the source
-  files with absolute pathnames and user names.
+  To prepare for regression testing, do "make all".  This compiles
+  a 'C' program with PostgreSQL extension functions into a shared library
+  in the current directory.  Localized SQL scripts and output-comparison
+  files are also created for the tests that need them.  The localization
+  replaces macros in the source files with absolute pathnames and user names.  
 
   It was formerly necessary to run the postmaster with system time zone
   set to PST, but this is no longer required.  You can run the regression
@@ -45,24 +42,32 @@ Directory Layout
   expected/ . .out files that represent what we *expect* the results to
               look like
 
-  results/ .. .out files that represent what the results *actually* look
+  results/ .. .out files that contain what the results *actually* look
               like. Also used as temporary storage for table copy testing.
 
 Running the regression test
 
-  If you have prevously invoked the regression test, clean up the
-  working directory with:
+  If you have previously run the regression test for a different Postgres
+  release, make sure you have up-to-date comparison files by doing
 
-        make clean
+        make clean all
 
   The regression test is invoked with the command:
 
-        make all runtest
+        make runtest
 
-  Normally, the regression test should be run as the pg_superuser since
+  or you can do
+
+	make runcheck
+
+  which invokes a parallel form of the regress tests, and does not
+  need an already-installed postmaster.  Instead, runcheck creates
+  a temporary installation under the regress directory.
+
+  Normally, the regression tests should be run as the postgres user since
   the 'src/test/regress' directory and sub-directories are owned by the
-  pg_superuser. If you run the regression test as another user the
-  'src/test/regress' directory tree should be writeable to that user.
+  postgres user. If you run the regression test as another user the
+  'src/test/regress' directory tree must be writeable to that user.
 
 Comparing expected/actual output
 
@@ -74,6 +79,11 @@ Comparing expected/actual output
   The files might not compare exactly. The following paragraphs attempt
   to explain the differences.
 
+  Once the output files have been verified for a particular platform,
+  it is possible to provide new platform-specific comparison files,
+  so that future test runs won't report bogus "failures".  See
+  'Platform-specific comparison files', below.
+
 Error message differences
 
   Some of the regression tests involve intentional invalid input values.
@@ -83,20 +93,6 @@ Error message differences
   differences in messages will result in a "failed" regression test which
   can be validated by inspection.
 
-OID differences
-
-  There are several places where PostgreSQL OID (object identifiers) appear
-  in 'regress.out'. OID's are unique 32-bit integers which are generated
-  by the PostgreSQL backend whenever a table row is inserted or updated.
-  If you run the regression test on a non-virgin database or run it multiple
-  times, the OID's reported will have different values. 
-
-  The following SQL statements in 'misc.out' have shown this behavior:
-
-  QUERY: SELECT user_relns() AS user_relns ORDER BY user_relns;
-
-    The 'a,523676' row is composed from an OID.
-
 DATE/TIME differences
 
   Most of the date and time results are dependent on timezone environment.
@@ -164,6 +160,38 @@ The 'expected' files
   careful (?) inspection. Many of the development machines are running a
   Unix OS variant (FreeBSD, Linux, etc) on Ix86 hardware.
 
+Platform-specific comparison files
+
+  Since some of the tests inherently produce platform-specific results,
+  we have provided a way to supply platform-specific result comparison
+  files.  Frequently, the same variation applies to multiple platforms;
+  rather than supplying a separate comparison file for every platform,
+  there is a mapping file that defines which comparison file to use.
+  So, to eliminate bogus test "failures" for a particular platform,
+  you must choose or make a variant result file, and then add a line
+  to the mapping file, which is "resultmap".
+
+  Each line in the mapping file is of the form
+		testname/platformname=comparisonfilename
+  The test name is just the name of the particular regression test module.
+  The platform name is the platform name as printed by config.guess (in
+  the toplevel PostgreSQL src directory), or any prefix of it.  The
+  comparison file name is the name of the substitute result comparison file.
+
+  For example: the int2 regress test includes a deliberate entry of a value
+  that is too large to fit in int2.  The specific error message that is
+  produced is platform-dependent; our reference platform emits
+    ERROR:  pg_atoi: error reading "100000": Numerical result out of range
+  but a fair number of other Unix platforms emit
+    ERROR:  pg_atoi: error reading "100000": Result too large
+  Therefore, we provide a variant comparison file, int2-too-large.out,
+  that includes this spelling of the error message.  To silence the
+  bogus "failure" message on HPPA platforms,  resultmap includes
+		int2/hppa=int2-too-large
+  which will trigger on any machine for which config.guess's output
+  begins with 'hppa'.  Other lines in resultmap select the variant
+  comparison file for other platforms where it's appropriate.
+
 Current release notes (Thomas.Lockhart@jpl.nasa.gov)
 
   The regression tests have been adapted and extensively modified for the

src/test/regress/regress.sh

 #!/bin/sh
-# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.37 2000/01/06 06:40:18 thomas Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.38 2000/01/09 07:53:58 tgl Exp $
 #
 if [ $# -eq 0 ]
 then
-	echo "Syntax: $0 <portname> [extra-tests]"
+	echo "Syntax: $0 <hostname> [extra-tests]"
 	exit 1
 fi
 
-portname=$1
+hostname=$1
 shift
 extratests="$*"
 
-if [ x$portname = "xwin" -o x$portname = "xqnx4" ]
+if [ "x$hostname" = "xwin" -o "x$hostname" = "xqnx4" ]
 then
-	HOST="-h localhost"
+	HOSTLOC="-h localhost"
 else
-	HOST=""
+	HOSTLOC=""
 fi
 
 if echo '\c' | grep -s c >/dev/null 2>&1
@@ -35,19 +35,16 @@ PGTZ="PST8PDT"; export PGTZ
 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", $1, a[1] }'`
+FRONTEND="psql $HOSTLOC -n -e -q"
 
 echo "=============== Notes...                              ================="
 echo "postmaster must already be running for the regression tests to succeed."
-echo "The time zone is set to PST8PDT for these tests by the client frontend."
 echo "Please report any apparent problems to ports@postgresql.org"
 echo "See regress/README for more information."
 echo ""
 
 echo "=============== dropping old regression database...   ================="
-dropdb $HOST regression
+dropdb $HOSTLOC regression
 
 echo "=============== creating new regression database...   ================="
 if [ -n "$MULTIBYTE" ];then
@@ -60,16 +57,16 @@ else
 	unset PGCLIENTENCODING
 	ENCODINGOPT=""
 fi
-createdb $ENCODINGOPT $HOST regression
+createdb $ENCODINGOPT $HOSTLOC regression
 if [ $? -ne 0 ]; then
      echo createdb failed
      exit 1
 fi
 
-if [ x$portname != "xqnx4" ]
+if [ "x$hostname" != "xqnx4" ]
 then
 echo "=============== installing PL/pgSQL...                ================="
-createlang $HOST plpgsql regression
+createlang $HOSTLOC plpgsql regression
 if [ $? -ne 0 -a $? -ne 2 ]; then
      echo createlang failed
      exit 1
@@ -79,7 +76,7 @@ fi
 echo "=============== running regression queries...         ================="
 echo "" > regression.diffs
 
-if [ x$portname = "xqnx4" ]
+if [ "x$hostname" = "xqnx4" ]
 then
 	DIFFOPT="-b"
 else
@@ -91,20 +88,42 @@ $1=="test"	{ print $2; }
 			{}
 ' < sql/run_check.tests`
 
-for i in $stdtests $mbtests $extratests
+for tst in $stdtests $mbtests $extratests
 do
-	$ECHO_N "${i} .. " $ECHO_C
-	$FRONTEND regression < sql/${i}.sql > results/${i}.out 2>&1
-	if [ -f expected/${i}-${SYSTEM}.out ]
-	then
-		EXPECTED="expected/${i}-${SYSTEM}.out"
+	$ECHO_N "${tst} .. " $ECHO_C
+	$FRONTEND regression < sql/${tst}.sql > results/${tst}.out 2>&1
+
+	#
+	# Check resultmap to see if we should compare to a
+	# system-specific result file.  The format of the .similar file is
+	#	testname/hostname=substitutefile
+	# There shouldn't be multiple matches, but take the last if there are.
+	#
+	EXPECTED="expected/${tst}.out"
+	SUBST=`grep "^$tst/$hostname=" resultmap | sed 's/^.*=//' | tail -1`
+	if test "$SUBST"
+	then EXPECTED="expected/${SUBST}.out"
 	else
-		EXPECTED="expected/${i}.out"
+	    # Next look for a .similar entry that is a prefix of $hostname.
+	    # If there are multiple matches, take the last one.
+	    exec 4<resultmap
+	    while read LINE <&4
+	    do
+		SIMHOST=`expr "$LINE" : '\(.*\)='`
+		MATCH=`expr "$tst/$hostname" : "$SIMHOST"`
+		if test "$MATCH" != 0
+		then SUBST=`echo "$LINE" | sed 's/^.*=//'`
+		fi
+	    done
+	    exec 4<&-
+	    if test "$SUBST"
+	    then EXPECTED="expected/${SUBST}.out"
+	    fi
 	fi
 
-	if [ `diff ${DIFFOPT} ${EXPECTED} results/${i}.out | wc -l` -ne 0 ]
+	if [ `diff ${DIFFOPT} ${EXPECTED} results/${tst}.out | wc -l` -ne 0 ]
 	then
-		( diff ${DIFFOPT} -C3 ${EXPECTED} results/${i}.out; \
+		( diff ${DIFFOPT} -C3 ${EXPECTED} results/${tst}.out; \
 		echo "";  \
 		echo "----------------------"; \
 		echo "" ) >> regression.diffs

src/test/regress/resultmap

+int2/hppa=int2-too-large
+int4/hppa=int4-too-large
+geometry/hppa2.0=geometry-hppa2.0
+horology/hppa=horology-no-DST-before-1970

src/test/regress/run_check.sh

 #!/bin/sh
 #
-# $Header: /cvsroot/pgsql/src/test/regress/Attic/run_check.sh,v 1.4 1999/12/03 12:47:43 wieck Exp $
-
-# ----------
-# This is currently needed because the actual 7.0 psql makes
-# all tests fail. Set a path to an existing 6.5.x version of
-# psql, the will be copied into the temporary installation
-# as psql.
-# ----------
-TEMP_PSQL_HACK=`which psql_65`
+# $Header: /cvsroot/pgsql/src/test/regress/Attic/run_check.sh,v 1.5 2000/01/09 07:53:58 tgl Exp $
 
 # ----------
 # Check call syntax
 # ----------
 if [ $# -eq 0 ]
 then
-    echo "Syntax: $0 <portname> [extra-tests]"
+    echo "Syntax: $0 <hostname> [extra-tests]"
     exit 1
 fi
 
@@ -25,18 +17,18 @@ fi
 cd `dirname $0`
 
 # ----------
-# Some paths used durint the test
+# Some paths used during the test
 # ----------
 PWD=`pwd`
-CHKDIR=$PWD/tmp_check
-PGDATA=$CHKDIR/data
-LIBDIR=$CHKDIR/lib
-BINDIR=$CHKDIR/bin
-LOGDIR=$CHKDIR/log
-TIMDIR=$CHKDIR/timestamp
-PGPORT=65432
-PGLIB=$LIBDIR
-PMPID=
+CHKDIR="$PWD/tmp_check"
+PGDATA="$CHKDIR/data"
+LIBDIR="$CHKDIR/lib"
+BINDIR="$CHKDIR/bin"
+LOGDIR="$CHKDIR/log"
+TIMDIR="$CHKDIR/timestamp"
+PGPORT="65432"
+PGLIB="$LIBDIR"
+PMPID=""
 
 export CHKDIR
 export PGDATA
@@ -49,18 +41,18 @@ export PGPORT
 # ----------
 # Get the commandline parameters
 # ----------
-portname=$1
+hostname=$1
 shift
 extratests="$*"
 
 # ----------
 # Special setting for Windows (no unix domain sockets)
 # ----------
-if [ x$portname = "xwin" ]
+if [ "x$hostname" = "xwin" ]
 then
-    HOST="-h localhost"
+    HOSTLOC="-h localhost"
 else
-    HOST=""
+    HOSTLOC=""
 fi
 
 # ----------
@@ -84,13 +76,19 @@ PGDATESTYLE="Postgres,US"; export PGDATESTYLE
 # ----------
 # The SQL shell to use during this test
 # ----------
-FRONTEND="$BINDIR/psql $HOST -n -e -q"
+FRONTEND="$BINDIR/psql $HOSTLOC -n -e -q"
 
 # ----------
-# Determine system type
+# Prepare temp file holding combined test script.
 # ----------
-SYSTEM=`/bin/sh ../../config.guess | awk -F\- '{ split($3,a,/[0-9]/); printf"%s-%s", $1,
- a[1] }'`
+TESTLIST="/tmp/testlist.$$"
+TESTS=./sql/run_check.tests
+(
+	cat $TESTS 
+	for name in $extratests ; do
+		echo "test $name"
+	done
+) > $TESTLIST
 
 # ----------
 # Catch SIGINT and SIGTERM to shutdown the postmaster
@@ -106,6 +104,7 @@ trap '	echo ""
 			echo ""
 		fi
 		echo ""
+		rm $TESTLIST
 		exit 1
 ' 2 15
 
@@ -140,15 +139,6 @@ then
 fi
 
 
-# ----------
-# Copy an explicitly to use psql shell over the built one
-# ----------
-if [ ! -z "$TEMP_PSQL_HACK" ] ; then
-	rm -f $BINDIR/psql
-	cp $TEMP_PSQL_HACK $BINDIR/psql
-fi
-
-
 # ----------
 # Change the path so that all binaries from the current
 # build are first candidates
@@ -210,7 +200,7 @@ else
     unset PGCLIENTENCODING
     ENCODINGOPT=""
 fi
-createdb $ENCODINGOPT $HOST regression
+createdb $ENCODINGOPT $HOSTLOC regression
 if [ $? -ne 0 ]; then
      echo createdb failed
 	 kill -15 $PMPID
@@ -222,7 +212,7 @@ fi
 # Install the PL/pgSQL language in it
 # ----------
 echo "=============== Installing PL/pgSQL...                 ================"
-createlang $HOST plpgsql regression
+createlang $HOSTLOC plpgsql regression
 if [ $? -ne 0 -a $? -ne 2 ]; then
      echo createlang failed
 	 kill -15 $PMPID
@@ -231,21 +221,15 @@ fi
 
 
 # ----------
-# Run the regression tests specified in the ./sql/run_check.tests file
+# Run the regression tests specified in the $TESTLIST file
 # ----------
 echo "=============== Running regression queries...          ================"
 echo "" > regression.diffs
 echo "" > regress.out
 
-TESTS=./sql/run_check.tests
 lno=0
-(
-	cat $TESTS 
-	for name in $extratests ; do
-		echo "test $name"
-	done
-) | while read line ; do
-
+while read line
+do
 	# ----------
 	# Count line numbers and skip comments and empty lines
 	# ----------
@@ -272,7 +256,8 @@ lno=0
 					pargroup=$name
 					parntests=0
 					parpar=0
-					while read line ; do
+					while read line
+					do
 						# ----------
 						# Again count line numbers and skip comments
 						# ----------
@@ -349,7 +334,7 @@ lno=0
 								> results/${name}.out 2>&1
 							$ECHO_N " $name" $ECHO_C
 						) &
-					done
+					done </dev/null
 					wait
 					echo ""
 
@@ -394,35 +379,55 @@ lno=0
 	# old format, so checkresults will still find the proper
 	# information.
 	# ----------
-	for name in $checklist ; do
+	for tst in $checklist ; do
 		if [ $checkpname -ne 0 ]
 		then
-			pnam=`echo $name | awk '{printf "%-20.20s", $1;}'`
+			pnam=`echo $tst | awk '{printf "%-20.20s", $1;}'`
 			$ECHO_N "           test $pnam ... " $ECHO_C
 		fi
 
-		if [ -f expected/${name}-${SYSTEM}.out ]
-		then
-			EXPECTED="expected/${name}-${SYSTEM}.out"
+		#
+		# Check resultmap to see if we should compare to a
+		# system-specific result file.  The format of the file is
+		#	testname/hostname=substitutefile
+		# There shouldn't be multiple matches, but take the last if there are.
+		#
+		EXPECTED="expected/${tst}.out"
+		SUBST=`grep "^$tst/$hostname=" resultmap | sed 's/^.*=//' | tail -1`
+		if test "$SUBST"
+		then EXPECTED="expected/${SUBST}.out"
 		else
-			EXPECTED="expected/${name}.out"
+		    # Next look for a .similar entry that is a prefix of $hostname.
+		    # If there are multiple matches, take the last one.
+		    while read LINE
+		    do
+			SIMHOST=`expr "$LINE" : '\(.*\)='`
+			MATCH=`expr "$tst/$hostname" : "$SIMHOST"`
+			echo "$LINE $SIMHOST $MATCH"
+			if test "$MATCH" != 0
+			then SUBST=`echo "$LINE" | sed 's/^.*=//'`
+			fi
+		    done <resultmap
+		    if test "$SUBST"
+		    then EXPECTED="expected/${SUBST}.out"
+		    fi
 		fi
 
-		if [ `diff -w ${EXPECTED} results/${name}.out | wc -l` -ne 0 ]
+		if [ `diff -w ${EXPECTED} results/${tst}.out | wc -l` -ne 0 ]
 		then
-			(	diff -wC3 ${EXPECTED} results/${name}.out	; \
+			(	diff -wC3 ${EXPECTED} results/${tst}.out	; \
 				echo ""										; \
 				echo "----------------------"				; \
 				echo ""										; \
 			) >> regression.diffs
 			echo "FAILED"
-			echo "$name .. failed" >> regress.out
+			echo "$tst .. failed" >> regress.out
 		else
 			echo "ok"
-			echo "$name .. ok" >> regress.out
+			echo "$tst .. ok" >> regress.out
 		fi
 	done
-done | tee run_check.out 2>&1
+done <$TESTLIST | tee run_check.out 2>&1
 
 # ----------
 # Finally kill the postmaster we started
@@ -430,5 +435,6 @@ done | tee run_check.out 2>&1
 echo "=============== Terminating regression postmaster      ================"
 kill -15 $PMPID
 
+rm $TESTLIST
 
 exit 0