improvements to regression testing

submitted by: dr. george

src/test/regress/Makefile

+From scrappy@ki.net Thu Jul 25 05:51:19 1996
+Status: RO
+X-Status: 
+Received: from daemun.ilt.com ([204.247.102.21]) by ki.net (8.7.5/8.7.5) with ESMTP id FAA12531 for <scrappy@ki.net>; Thu, 25 Jul 1996 05:51:16 -0400 (EDT)
+From: postgres@madmax.ilt.com
+Received: from madmax.ilt.com (madmax [199.26.203.43]) by daemun.ilt.com (8.7.5/8.7.3) with SMTP id CAA09205 for <scrappy@ki.net>; Thu, 25 Jul 1996 02:50:12 -0700 (PDT)
+Received: by madmax.ilt.com (SMI-8.6/ILT-SVR4-1.1)
+	id CAA00419; Thu, 25 Jul 1996 02:45:47 -0700
+Date: Thu, 25 Jul 1996 02:45:47 -0700
+Message-Id: <199607250945.CAA00419@madmax.ilt.com>
+To: scrappy@ki.net
+Subject: /user/postgres95/src/test/regress/Makefile == revised
+
 #-------------------------------------------------------------------------
 #
 # Makefile--
@@ -7,7 +20,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/regress/Makefile,v 1.2 1996/07/23 03:19:34 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/test/regress/Makefile,v 1.3 1996/07/25 19:56:58 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -46,9 +59,12 @@ $(OUTFILES): $(CREATEFILES)
 	@echo "RESULTS OF REGRESSION ARE SAVED IN $(objdir)/regress.out"
 
 #
-# expected results file
+# expected results file -- expand macros for user and location
+#
+# the expected.input file is make by hand from 'regress.out' when the
+# regression test has been updated and a successful output obtained
 #
-expected.out: expected.in
+expected.out: expected.input
 	if [ -z "$$USER" ]; then USER=$$LOGNAME; fi; \
 	if [ -z "$$USER" ]; then USER=`whoami`; fi; \
 	if [ -z "$$USER" ]; then echo 'Cannot deduce $USER.'; exit 1; fi; \
@@ -56,21 +72,8 @@ expected.out: expected.in
 	C="`pwd`"; \
 	sed -e "s:_CWD_:$$C:g" \
 	   -e "s:_OBJWD_:$$C/$(objdir):g" \
-	   -e "s/_USER_/$$USER/g" < expected.in > $(objdir)/expected.out
+	   -e "s/_USER_/$$USER/g" < expected.input > $(objdir)/expected.out
 
-#
-# make a new expected results file from the current 'results.out'
-# rename 'expected.new' to 'expected.in' by hand to avoid circular makes
-#
-expected.new: regress.out
-	if [ -z "$$USER" ]; then USER=$$LOGNAME; fi; \
-	if [ -z "$$USER" ]; then USER=`whoami`; fi; \
-	if [ -z "$$USER" ]; then echo 'Cannot deduce $USER.'; exit 1; fi; \
-	C="`pwd`"; \
-	sed -e "s:$$C:_CWD_:g" \
-	   -e "s:$$C/$(objdir):_OBJWD_:g" \
-	   -e "s/$$USER/_USER_/g" < $(objdir)/regress.out > expected.new
- 
 #
 # prepare to run the test (including clean-up after the last run)
 #
@@ -86,3 +89,4 @@ runtest: expected.out regress.out
 # installation
 #
 install: localobj all
+