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

Commitcad0e82

Browse files
committed
Provide a --no-locale option for pg_regress and a corresponding NOLOCALE=1setting for the regression makefile, allowing Windows users to force localesettings since Windows does not get its locale from the environment.Per Petr Jelinek.
1 parent37a4232 commitcad0e82

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

‎src/test/regress/GNUmakefile‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
77
# Portions Copyright (c) 1994, Regents of the University of California
88
#
9-
# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.52 2005/07/28 04:32:32 tgl Exp $
9+
# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.53 2005/11/01 15:09:11 adunstan Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -28,6 +28,11 @@ ifdef MAX_CONNECTIONS
2828
MAXCONNOPT += --max-connections=$(MAX_CONNECTIONS)
2929
endif
3030

31+
# locale
32+
NOLOCALE :=
33+
ifdefNO_LOCALE
34+
NOLOCALE += --no-locale
35+
endif
3136

3237
##
3338
## Prepare for tests
@@ -132,17 +137,17 @@ all-spi:
132137
check: all
133138
-rm -rf ./testtablespace
134139
mkdir ./testtablespace
135-
$(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql$(MAXCONNOPT)
140+
$(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql$(MAXCONNOPT)$(NOLOCALE)
136141

137142
installcheck: all
138143
-rm -rf ./testtablespace
139144
mkdir ./testtablespace
140-
$(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql
145+
$(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql$(NOLOCALE)
141146

142147
installcheck-parallel: all
143148
-rm -rf ./testtablespace
144149
mkdir ./testtablespace
145-
$(SHELL) ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql$(MAXCONNOPT)
150+
$(SHELL) ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql$(MAXCONNOPT)$(NOLOCALE)
146151

147152

148153
# old interfaces follow...
@@ -152,10 +157,10 @@ runtest: installcheck
152157
runtest-parallel: installcheck-parallel
153158

154159
bigtest:
155-
$(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql numeric_big
160+
$(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql$(NOLOCALE)numeric_big
156161

157162
bigcheck:
158-
$(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql$(MAXCONNOPT) numeric_big
163+
$(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql$(MAXCONNOPT)$(NOLOCALE)numeric_big
159164

160165

161166
##

‎src/test/regress/pg_regress.sh‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.60 2005/09/05 23:50:49 tgl Exp $
2+
# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.61 2005/11/01 15:09:11 adunstan Exp $
33

44
me=`basename$0`
55
:${TMPDIR=/tmp}
@@ -24,6 +24,7 @@ Options:
2424
--schedule=FILE use test ordering schedule from FILE
2525
(may be used multiple times to concatenate)
2626
--temp-install[=DIR] create a temporary installation (in DIR)
27+
--no-locale use C locale
2728
2829
Options for\`temp-install' mode:
2930
--top-builddir=DIR (relative) path to top level build directory
@@ -99,6 +100,7 @@ fi
99100
unset mode
100101
unset schedule
101102
unset debug
103+
unset nolocale
102104
unset top_builddir
103105
unset temp_install
104106
unset multibyte
@@ -142,6 +144,9 @@ do
142144
--multibyte=*)
143145
multibyte=`expr"x$1":"x--multibyte=\(.*\)"`
144146
shift;;
147+
--no-locale)
148+
nolocale=yes
149+
shift;;
145150
--temp-install)
146151
temp_install=./tmp_check
147152
shift;;
@@ -403,7 +408,8 @@ then
403408
fi
404409

405410
message"initializing database system"
406-
["$debug"= yes ]&& initdb_options='--debug'
411+
["$debug"= yes ]&& initdb_options="--debug"
412+
["$nolocale"= yes ]&& initdb_options="$initdb_options --no-locale"
407413
"$bindir/initdb" -D"$PGDATA" -L"$datadir" --noclean$initdb_options>"$LOGDIR/initdb.log"2>&1
408414

409415
if [$?-ne 0 ]

0 commit comments

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