diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/regress/GNUmakefile | 17 | ||||
| -rw-r--r-- | src/test/regress/pg_regress.sh | 10 |
2 files changed, 19 insertions, 8 deletions
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index 646aceb6664..822147b8b67 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.48.4.1 2005/07/17 18:29:13 tgl Exp $ +# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.48.4.2 2005/11/01 15:32:52 adunstan Exp $ # #------------------------------------------------------------------------- @@ -34,6 +34,11 @@ ifdef MAX_CONNECTIONS MAXCONNOPT += --max-connections=$(MAX_CONNECTIONS) endif +# locale +NOLOCALE := +ifdef NO_LOCALE +NOLOCALE += --no-locale +endif ## ## Prepare for tests @@ -133,17 +138,17 @@ all-spi: check: all -rm -rf ./testtablespace mkdir ./testtablespace - $(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT) + $(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT) $(NOLOCALE) installcheck: all -rm -rf ./testtablespace mkdir ./testtablespace - $(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) + $(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) $(NOLOCALE) installcheck-parallel: all -rm -rf ./testtablespace mkdir ./testtablespace - $(SHELL) ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT) + $(SHELL) ./pg_regress --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT) $(NOLOCALE) # old interfaces follow... @@ -153,10 +158,10 @@ runtest: installcheck runtest-parallel: installcheck-parallel bigtest: - $(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) numeric_big + $(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE) $(NOLOCALE) numeric_big bigcheck: - $(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT) numeric_big + $(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT) $(NOLOCALE) numeric_big ## diff --git a/src/test/regress/pg_regress.sh b/src/test/regress/pg_regress.sh index aeb385b9ec6..0a9d97f451c 100644 --- a/src/test/regress/pg_regress.sh +++ b/src/test/regress/pg_regress.sh @@ -1,5 +1,5 @@ #! /bin/sh -# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.53.4.1 2005/07/17 18:29:13 tgl Exp $ +# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.53.4.2 2005/11/01 15:32:52 adunstan Exp $ me=`basename $0` : ${TMPDIR=/tmp} @@ -21,6 +21,7 @@ Options: --schedule=FILE use test ordering schedule from FILE (may be used multiple times to concatenate) --temp-install[=DIR] create a temporary installation (in DIR) + --no-locale use C locale Options for \`temp-install' mode: --top-builddir=DIR (relative) path to top level build directory @@ -97,6 +98,7 @@ fi unset mode unset schedule unset debug +unset nolocale unset top_builddir unset temp_install unset multibyte @@ -131,6 +133,9 @@ do --multibyte=*) multibyte=`expr "x$1" : "x--multibyte=\(.*\)"` shift;; + --no-locale) + nolocale=yes + shift;; --temp-install) temp_install=./tmp_check shift;; @@ -408,7 +413,8 @@ then rm $backup message "initializing database system" - [ "$debug" = yes ] && initdb_options='--debug' + [ "$debug" = yes ] && initdb_options="--debug" + [ "$nolocale" = yes ] && initdb_options="$initdb_options --no-locale" "$bindir/initdb" -D "$PGDATA" -L "$datadir" --noclean $initdb_options >"$LOGDIR/initdb.log" 2>&1 if [ $? -ne 0 ] |