From c39c198bc333363c7a74e6e8c91b57466027ec3d Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Sun, 23 Jul 2000 13:01:11 +0000
Subject: [PATCH] Unset locale variables before running regression tests. (All
of them!) Don't do config.status substitutions into the regression test
makefile.
---
configure | 2 --
configure.in | 1 -
src/GNUmakefile.in | 3 +--
src/test/regress/{GNUmakefile.in => GNUmakefile} | 11 ++++++-----
src/test/regress/regress.sh | 5 ++---
src/test/regress/run_check.sh | 8 +++++++-
src/test/regress/system.sh | 2 +-
7 files changed, 17 insertions(+), 15 deletions(-)
rename src/test/regress/{GNUmakefile.in => GNUmakefile} (92%)
diff --git a/configure b/configure
index 55e85474877..2234d9f0636 100755
--- a/configure
+++ b/configure
@@ -7855,7 +7855,6 @@ trap 'rm -fr `echo "
src/GNUmakefile
src/Makefile.global
src/backend/port/Makefile
- src/test/regress/GNUmakefile
src/include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
@@ -8015,7 +8014,6 @@ CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile
src/GNUmakefile
src/Makefile.global
src/backend/port/Makefile
- src/test/regress/GNUmakefile
"}
EOF
cat >> $CONFIG_STATUS <<\EOF
diff --git a/configure.in b/configure.in
index c035dc14aea..1e125a1bbc8 100644
--- a/configure.in
+++ b/configure.in
@@ -1282,7 +1282,6 @@ AC_OUTPUT(
src/GNUmakefile
src/Makefile.global
src/backend/port/Makefile
- src/test/regress/GNUmakefile
],
[echo timestamp > src/include/stamp-h]
)
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.in b/src/test/regress/GNUmakefile
similarity index 92%
rename from src/test/regress/GNUmakefile.in
rename to src/test/regress/GNUmakefile
index 88b207ebcef..7162ba4420c 100644
--- a/src/test/regress/GNUmakefile.in
+++ b/src/test/regress/GNUmakefile
@@ -7,16 +7,17 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/test/regress/Attic/GNUmakefile.in,v 1.2 2000/05/29 05:45:55 tgl Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.22 2000/07/23 13:01:10 petere Exp $
#
#-------------------------------------------------------------------------
-SRCDIR= ../..
-include $(SRCDIR)/Makefile.global
+subdir = src/test/regress
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
-CONTRIB= $(SRCDIR)/../contrib
+CONTRIB= $(top_builddir)/contrib
-HOST= @host@
+HOST := $(shell $(top_srcdir)/config/config.guess)
CFLAGS+= -I$(LIBPQDIR) $(CFLAGS_SL)
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 ""
--
GitLab