database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-22 23:02:54 +03:00
Code

Unset locale variables before running regression tests. (All of them!)

Browse Source 
Don't do config.status substitutions into the regression test makefile.
This commit is contained in:
Peter Eisentraut 2000-07-23 13:01:11 +00:00
parent 8d77c1a8aa
commit c39c198bc3
7 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -7855,7 +7855,6 @@ trap 'rm -fr `echo "
src/GNUmakefile src/GNUmakefile
src/Makefile.global src/Makefile.global
src/backend/port/Makefile src/backend/port/Makefile
src/test/regress/GNUmakefile
src/include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 src/include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF EOF
cat >> $CONFIG_STATUS <<EOF cat >> $CONFIG_STATUS <<EOF
@ -8015,7 +8014,6 @@ CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile
src/GNUmakefile src/GNUmakefile
src/Makefile.global src/Makefile.global
src/backend/port/Makefile src/backend/port/Makefile
src/test/regress/GNUmakefile
"} "}
EOF EOF
cat >> $CONFIG_STATUS <<\EOF cat >> $CONFIG_STATUS <<\EOF

1
configure.in
View File

@ -1282,7 +1282,6 @@ AC_OUTPUT(
src/GNUmakefile src/GNUmakefile
src/Makefile.global src/Makefile.global
src/backend/port/Makefile src/backend/port/Makefile
src/test/regress/GNUmakefile
], ],
[echo timestamp > src/include/stamp-h] [echo timestamp > src/include/stamp-h]
) )

3
src/GNUmakefile.in
View File

@ -4,7 +4,7 @@
# #
# Copyright (c) 1994, Regents of the University of California # 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 bin $@
-$(MAKE) -C pl $@ -$(MAKE) -C pl $@
-$(MAKE) -C test clean -$(MAKE) -C test clean
rm -f test/regress/GNUmakefile
rm -f Makefile.port Makefile.global GNUmakefile rm -f Makefile.port Makefile.global GNUmakefile

11
src/test/regress/GNUmakefile.in → src/test/regress/GNUmakefile
View File

@ -7,16 +7,17 @@
# #
# #
# IDENTIFICATION # 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= ../.. subdir = src/test/regress
include $(SRCDIR)/Makefile.global 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) CFLAGS+= -I$(LIBPQDIR) $(CFLAGS_SL)

5
src/test/regress/regress.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/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 if [ $# -eq 0 ]; then
echo "Syntax: $0 <hostname> [extra-tests]" echo "Syntax: $0 <hostname> [extra-tests]"
@ -30,8 +30,7 @@ fi
PGTZ="PST8PDT"; export PGTZ PGTZ="PST8PDT"; export PGTZ
PGDATESTYLE="Postgres,US"; export PGDATESTYLE PGDATESTYLE="Postgres,US"; export PGDATESTYLE
LANG= ; export LANG unset LC_COLLATE LC_CTYPE LC_MONETARY LC_MESSAGES LC_NUMERIC LC_TIME LC_ALL LANG LANGUAGE
LC_ALL= ; export LC_ALL
FRONTEND="psql $HOSTLOC -a -q -X" FRONTEND="psql $HOSTLOC -a -q -X"

8
src/test/regress/run_check.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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 # Check call syntax
@ -49,6 +49,12 @@ else
fi fi
export LD_LIBRARY_PATH 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 # Get the commandline parameters
# ---------- # ----------

2
src/test/regress/system.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
echo -n "string to use for system specific expected/* files: " 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 "" echo ""