Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc39c198

Browse files
committed
Unset locale variables before running regression tests. (All of them!)
Don't do config.status substitutions into the regression test makefile.
1 parent8d77c1a commitc39c198

File tree

7 files changed

+17
-15
lines changed

7 files changed

+17
-15
lines changed

‎configure

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7855,7 +7855,6 @@ trap 'rm -fr `echo "
78557855
src/GNUmakefile
78567856
src/Makefile.global
78577857
src/backend/port/Makefile
7858-
src/test/regress/GNUmakefile
78597858
src/include/config.h"| sed"s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
78607859
EOF
78617860
cat>>$CONFIG_STATUS<<EOF
@@ -8015,7 +8014,6 @@ CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile
80158014
src/GNUmakefile
80168015
src/Makefile.global
80178016
src/backend/port/Makefile
8018-
src/test/regress/GNUmakefile
80198017
"}
80208018
EOF
80218019
cat>>$CONFIG_STATUS<<\EOF

‎configure.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1282,7 +1282,6 @@ AC_OUTPUT(
12821282
src/GNUmakefile
12831283
src/Makefile.global
12841284
src/backend/port/Makefile
1285-
src/test/regress/GNUmakefile
12861285
],
12871286
[echo timestamp > src/include/stamp-h]
12881287
)

‎src/GNUmakefile.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.58 2000/07/19 16:29:42 petere Exp $
7+
# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.59 2000/07/23 13:01:08 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -37,5 +37,4 @@ distclean maintainer-clean:
3737
-$(MAKE) -C bin $@
3838
-$(MAKE) -C pl $@
3939
-$(MAKE) -C test clean
40-
rm -f test/regress/GNUmakefile
4140
rm -f Makefile.port Makefile.global GNUmakefile

‎src/test/regress/GNUmakefile.inrenamed to‎src/test/regress/GNUmakefile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,17 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/test/regress/Attic/GNUmakefile.in,v 1.2 2000/05/29 05:45:55 tgl Exp $
10+
# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.22 2000/07/23 13:01:10 petere Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

14-
SRCDIR= ../..
15-
include $(SRCDIR)/Makefile.global
14+
subdir = src/test/regress
15+
top_builddir = ../../..
16+
include$(top_builddir)/src/Makefile.global
1617

17-
CONTRIB= $(SRCDIR)/../contrib
18+
CONTRIB=$(top_builddir)/contrib
1819

19-
HOST= @host@
20+
HOST :=$(shell$(top_srcdir)/config/config.guess)
2021

2122
CFLAGS+= -I$(LIBPQDIR)$(CFLAGS_SL)
2223

‎src/test/regress/regress.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.51 2000/05/24 22:32:58 tgl Exp $
2+
# $Header: /cvsroot/pgsql/src/test/regress/Attic/regress.sh,v 1.52 2000/07/23 13:01:11 petere Exp $
33
#
44
if [$#-eq 0 ];then
55
echo"Syntax:$0 <hostname> [extra-tests]"
@@ -30,8 +30,7 @@ fi
3030

3131
PGTZ="PST8PDT";export PGTZ
3232
PGDATESTYLE="Postgres,US";export PGDATESTYLE
33-
LANG=;export LANG
34-
LC_ALL=;export LC_ALL
33+
unset LC_COLLATE LC_CTYPE LC_MONETARY LC_MESSAGES LC_NUMERIC LC_TIME LC_ALL LANG LANGUAGE
3534

3635
FRONTEND="psql$HOSTLOC -a -q -X"
3736

‎src/test/regress/run_check.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
#
3-
# $Header: /cvsroot/pgsql/src/test/regress/Attic/run_check.sh,v 1.24 2000/07/13 16:08:01 petere Exp $
3+
# $Header: /cvsroot/pgsql/src/test/regress/Attic/run_check.sh,v 1.25 2000/07/23 13:01:11 petere Exp $
44

55
# ----------
66
# Check call syntax
@@ -49,6 +49,12 @@ else
4949
fi
5050
export LD_LIBRARY_PATH
5151

52+
# ----------
53+
# Unset locale settings
54+
# ----------
55+
56+
unset LC_COLLATE LC_CTYPE LC_MONETARY LC_MESSAGES LC_NUMERIC LC_TIME LC_ALL LANG LANGUAGE
57+
5258
# ----------
5359
# Get the commandline parameters
5460
# ----------

‎src/test/regress/system.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/sh
22
echo -n"string to use for system specific expected/* files:"
3-
../../config.guess|awk -F\-'{ split($3,a,/[0-9]/); printf"%s-%s", $1, a[1] }'
3+
../../../config/config.guess|awk -F\-'{ split($3,a,/[0-9]/); printf"%s-%s", $1, a[1] }'
44
echo""

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp