From 245686d43a086ac2c9135a05b4fe940ad6537ed9 Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Tue, 23 Jul 1996 03:19:34 +0000
Subject: [PATCH] modifications to regressoin tests

---
 src/test/regress/Makefile | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/test/regress/Makefile b/src/test/regress/Makefile
index 852ffc5767..d11351dfdd 100644
--- a/src/test/regress/Makefile
+++ b/src/test/regress/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/regress/Makefile,v 1.1.1.1 1996/07/09 06:22:24 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/test/regress/Makefile,v 1.2 1996/07/23 03:19:34 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -34,7 +34,7 @@ DLOBJS= regress$(SLSUFF)
 # ... plus test query inputs
 #
 CREATEFILES= $(DLOBJS:%=$(objdir)/%) \
-	create.sql queries.sql errors.sql destroy.sql security.sql
+	create.sql queries.sql errors.sql destroy.sql security.sql expected.out
 
 
 OUTFILES= stud_emp.data onek.data regress.out aportal.out
@@ -45,6 +45,32 @@ $(OUTFILES): $(CREATEFILES)
 	$(SHELL) ./regress.sh 2>&1 | tee $(objdir)/regress.out
 	@echo "RESULTS OF REGRESSION ARE SAVED IN $(objdir)/regress.out"
 
+#
+# expected results file
+#
+expected.out: expected.in
+	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; \
+	rm -f $(objdir)/expected.out; \
+	C="`pwd`"; \
+	sed -e "s:_CWD_:$$C:g" \
+	   -e "s:_OBJWD_:$$C/$(objdir):g" \
+	   -e "s/_USER_/$$USER/g" < expected.in > $(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)
 #
@@ -54,7 +80,7 @@ all:: $(CREATEFILES)
 #
 # run the test
 #
-runtest: regress.out
+runtest: expected.out regress.out
 
 #
 # installation