From c39c198bc333363c7a74e6e8c91b57466027ec3d Mon Sep 17 00:00:00 2001
From: Peter Eisentraut
Date: Sun, 23 Jul 2000 13:01:11 +0000
Subject: Unset locale variables before running regression tests. (All of
 them!) Don't do config.status substitutions into the regression test
 makefile.

---
 src/GNUmakefile.in              |   3 +-
 src/test/regress/GNUmakefile    | 140 ++++++++++++++++++++++++++++++++++++++++
 src/test/regress/GNUmakefile.in | 139 ---------------------------------------
 src/test/regress/regress.sh     |   5 +-
 src/test/regress/run_check.sh   |   8 ++-
 src/test/regress/system.sh      |   2 +-
 6 files changed, 151 insertions(+), 146 deletions(-)
 create mode 100644 src/test/regress/GNUmakefile
 delete mode 100644 src/test/regress/GNUmakefile.in

(limited to 'src')

diff --git a/src/GNUmakefile.in b/src/GNUmakefile.in
index 236400f8e07..98e46999c6f 100644
--- a/src/GNUmakefile.in
+++ b/src/GNUmakefile.in
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.58 2000/07/19 16:29:42 petere Exp $
+# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.59 2000/07/23 13:01:08 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -37,5 +37,4 @@ distclean maintainer-clean:
 	-$(MAKE) -C bin $@
 	-$(MAKE) -C pl $@
 	-$(MAKE) -C test clean
-	rm -f test/regress/GNUmakefile
 	rm -f Makefile.port Makefile.global GNUmakefile
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
new file mode 100644
index 00000000000..7162ba4420c
--- /dev/null
+++ b/src/test/regress/GNUmakefile
@@ -0,0 +1,140 @@
+#-------------------------------------------------------------------------
+#
+# 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.22 2000/07/23 13:01:10 petere Exp $
+#
+#-------------------------------------------------------------------------
+
+subdir = src/test/regress
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
+
+CONTRIB= $(top_builddir)/contrib
+
+HOST := $(shell $(top_srcdir)/config/config.guess)
+
+CFLAGS+= -I$(LIBPQDIR) $(CFLAGS_SL)
+
+LDADD+= -L$(LIBPQDIR) -lpq
+        
+#
+# DLOBJS is the dynamically-loaded object file.  The regression test uses 
+# this when it does a CREATE FUNCTION ... LANGUAGE 'C').
+#
+DLOBJS= regress$(DLSUFFIX)
+
+#
+# ... plus test query inputs
+#
+# INFILES is the files the regression test uses for input.
+INFILES= $(DLOBJS) 
+
+#
+# plus exports files
+#
+ifdef EXPSUFF
+INFILES+= $(DLOBJS:.o=$(EXPSUFF))
+endif
+
+#
+# huge extra tests run in target bigtest
+#
+EXTRA_TESTS	= numeric_big
+
+#
+# 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)
+#else
+#	cat /dev/null > $(CONTRIB)/spi/refint$(DLSUFFIX)
+#	cat /dev/null > $(CONTRIB)/spi/autoinc$(DLSUFFIX)
+#endif
+
+#ifeq ($(PORTNAME), win)
+#regress.dll: regress.c
+#	cat /dev/null > $@
+#endif
+
+#
+# run the tests
+#
+runtest: $(INFILES) 
+ifneq ($(PORTNAME), win)
+	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
+	$(SHELL) ./regress.sh $(HOST) 2>&1 | tee regress.out
+else
+	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
+	./regress.sh $(HOST) 2>&1 | tee regress.out
+endif
+	@echo "ACTUAL RESULTS OF REGRESSION TEST ARE NOW IN FILE regress.out"
+	@echo ""
+	@echo "To run the optional big test(s) too, type 'make bigtest'"
+	@echo "These big tests can take over an hour to complete"
+	@echo "These actually are: $(EXTRA_TESTS)"
+
+#
+# run the test including the huge extra tests
+#
+bigtest: $(INFILES) 
+ifneq ($(PORTNAME), win)
+	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
+	$(SHELL) ./regress.sh $(HOST) $(EXTRA_TESTS) 2>&1 | tee regress.out
+else
+	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
+	./regress.sh $(HOST) $(EXTRA_TESTS) 2>&1 | tee regress.out
+endif
+	@echo "ACTUAL RESULTS OF REGRESSION TEST ARE NOW IN FILE regress.out"
+
+#
+# run the parallel test suite
+#
+runcheck:	$(INFILES)
+ifneq ($(PORTNAME), win)
+	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
+	$(SHELL) ./run_check.sh $(HOST)
+else
+	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
+	./run_check.sh $(HOST)
+endif
+	@echo "ACTUAL RESULTS OF REGRESSION TEST ARE NOW IN FILES run_check.out"
+	@echo "AND regress.out"
+	@echo ""
+	@echo "To run the optional big test(s) too, type 'make bigcheck'"
+	@echo "These big tests can take over an hour to complete"
+	@echo "These actually are: $(EXTRA_TESTS)"
+
+#
+# run the test including the huge extra tests
+#
+bigcheck: $(INFILES) 
+ifneq ($(PORTNAME), win)
+	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
+	$(SHELL) ./run_check.sh $(HOST) $(EXTRA_TESTS)
+else
+	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
+	./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 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
+	rm -rf tmp_check
diff --git a/src/test/regress/GNUmakefile.in b/src/test/regress/GNUmakefile.in
deleted file mode 100644
index 88b207ebcef..00000000000
--- a/src/test/regress/GNUmakefile.in
+++ /dev/null
@@ -1,139 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# GNUmakefile--
-#    Makefile for regress (the regression tests)
-#
-# Copyright (c) 1994, Regents of the University of California
-#
-#
-# IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/regress/Attic/GNUmakefile.in,v 1.2 2000/05/29 05:45:55 tgl Exp $
-#
-#-------------------------------------------------------------------------
-
-SRCDIR= ../..
-include $(SRCDIR)/Makefile.global
-
-CONTRIB= $(SRCDIR)/../contrib
-
-HOST= @host@
-
-CFLAGS+= -I$(LIBPQDIR) $(CFLAGS_SL)
-
-LDADD+= -L$(LIBPQDIR) -lpq
-        
-#
-# DLOBJS is the dynamically-loaded object file.  The regression test uses 
-# this when it does a CREATE FUNCTION ... LANGUAGE 'C').
-#
-DLOBJS= regress$(DLSUFFIX)
-
-#
-# ... plus test query inputs
-#
-# INFILES is the files the regression test uses for input.
-INFILES= $(DLOBJS) 
-
-#
-# plus exports files
-#
-ifdef EXPSUFF
-INFILES+= $(DLOBJS:.o=$(EXPSUFF))
-endif
-
-#
-# huge extra tests run in target bigtest
-#
-EXTRA_TESTS	= numeric_big
-
-#
-# 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)
-#else
-#	cat /dev/null > $(CONTRIB)/spi/refint$(DLSUFFIX)
-#	cat /dev/null > $(CONTRIB)/spi/autoinc$(DLSUFFIX)
-#endif
-
-#ifeq ($(PORTNAME), win)
-#regress.dll: regress.c
-#	cat /dev/null > $@
-#endif
-
-#
-# run the tests
-#
-runtest: $(INFILES) 
-ifneq ($(PORTNAME), win)
-	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
-	$(SHELL) ./regress.sh $(HOST) 2>&1 | tee regress.out
-else
-	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
-	./regress.sh $(HOST) 2>&1 | tee regress.out
-endif
-	@echo "ACTUAL RESULTS OF REGRESSION TEST ARE NOW IN FILE regress.out"
-	@echo ""
-	@echo "To run the optional big test(s) too, type 'make bigtest'"
-	@echo "These big tests can take over an hour to complete"
-	@echo "These actually are: $(EXTRA_TESTS)"
-
-#
-# run the test including the huge extra tests
-#
-bigtest: $(INFILES) 
-ifneq ($(PORTNAME), win)
-	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
-	$(SHELL) ./regress.sh $(HOST) $(EXTRA_TESTS) 2>&1 | tee regress.out
-else
-	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
-	./regress.sh $(HOST) $(EXTRA_TESTS) 2>&1 | tee regress.out
-endif
-	@echo "ACTUAL RESULTS OF REGRESSION TEST ARE NOW IN FILE regress.out"
-
-#
-# run the parallel test suite
-#
-runcheck:	$(INFILES)
-ifneq ($(PORTNAME), win)
-	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
-	$(SHELL) ./run_check.sh $(HOST)
-else
-	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
-	./run_check.sh $(HOST)
-endif
-	@echo "ACTUAL RESULTS OF REGRESSION TEST ARE NOW IN FILES run_check.out"
-	@echo "AND regress.out"
-	@echo ""
-	@echo "To run the optional big test(s) too, type 'make bigcheck'"
-	@echo "These big tests can take over an hour to complete"
-	@echo "These actually are: $(EXTRA_TESTS)"
-
-#
-# run the test including the huge extra tests
-#
-bigcheck: $(INFILES) 
-ifneq ($(PORTNAME), win)
-	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
-	$(SHELL) ./run_check.sh $(HOST) $(EXTRA_TESTS)
-else
-	MULTIBYTE=$(MULTIBYTE);export MULTIBYTE; \
-	./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 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
-	rm -rf tmp_check
diff --git a/src/test/regress/regress.sh b/src/test/regress/regress.sh
index ef58dc34a98..a9521433f09 100755
--- a/src/test/regress/regress.sh
+++ b/src/test/regress/regress.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.51 2000/05/24 22:32:58 tgl Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.52 2000/07/23 13:01:11 petere Exp $
 #
 if [ $# -eq 0 ]; then
 	echo "Syntax: $0 <hostname> [extra-tests]"
@@ -30,8 +30,7 @@ fi
 
 PGTZ="PST8PDT"; export PGTZ
 PGDATESTYLE="Postgres,US"; export PGDATESTYLE
-LANG= ; export LANG
-LC_ALL= ; export LC_ALL
+unset LC_COLLATE LC_CTYPE LC_MONETARY LC_MESSAGES LC_NUMERIC LC_TIME LC_ALL LANG LANGUAGE
 
 FRONTEND="psql $HOSTLOC -a -q -X"
 
diff --git a/src/test/regress/run_check.sh b/src/test/regress/run_check.sh
index 4c9d34f7d88..e985d8286ca 100755
--- a/src/test/regress/run_check.sh
+++ b/src/test/regress/run_check.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Header: /cvsroot/pgsql/src/test/regress/Attic/run_check.sh,v 1.24 2000/07/13 16:08:01 petere Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/Attic/run_check.sh,v 1.25 2000/07/23 13:01:11 petere Exp $
 
 # ----------
 # Check call syntax
@@ -49,6 +49,12 @@ else
 fi
 export LD_LIBRARY_PATH
 
+# ----------
+# Unset locale settings
+# ----------
+
+unset LC_COLLATE LC_CTYPE LC_MONETARY LC_MESSAGES LC_NUMERIC LC_TIME LC_ALL LANG LANGUAGE
+
 # ----------
 # Get the commandline parameters
 # ----------
diff --git a/src/test/regress/system.sh b/src/test/regress/system.sh
index 4a30e207053..de147325434 100755
--- a/src/test/regress/system.sh
+++ b/src/test/regress/system.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 echo -n "string to use for system specific expected/* files: "
-../../config.guess |awk -F\- '{ split($3,a,/[0-9]/); printf"%s-%s", $1, a[1] }'
+../../../config/config.guess |awk -F\- '{ split($3,a,/[0-9]/); printf"%s-%s", $1, a[1] }'
 echo ""
-- 
cgit v1.2.3