aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2011-01-13 09:13:12 +0200
committerPeter Eisentraut <peter_e@gmx.net>2011-01-13 09:16:55 +0200
commit35eb0958be476d58dcc8ba462d57384e74a62d88 (patch)
tree83cfbbb718b0f75a7527f24732e6b3417f983ee2 /src
parenta0423ec02df3e311d6d5888170cb25a8c14bc6bf (diff)
downloadpostgresql-35eb0958be476d58dcc8ba462d57384e74a62d88.tar.gz
postgresql-35eb0958be476d58dcc8ba462d57384e74a62d88.zip
Don't run regression tests in SQL_ASCII encoding by default
Instead, run them in the encoding that the locale selects, which is more representative of real use. Also document how locale and encoding for regression test runs can be selected.
Diffstat (limited to 'src')
-rw-r--r--src/test/regress/GNUmakefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
index cb67e5a12a8..15b9ec49f71 100644
--- a/src/test/regress/GNUmakefile
+++ b/src/test/regress/GNUmakefile
@@ -23,9 +23,6 @@ endif
# where to find psql for testing an existing installation
PSQLDIR = $(bindir)
-# default encoding
-MULTIBYTE = SQL_ASCII
-
# maximum simultaneous connections for parallel tests
MAXCONNOPT =
ifdef MAX_CONNECTIONS
@@ -141,7 +138,7 @@ tablespace-setup:
## Run tests
##
-pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MULTIBYTE) $(NOLOCALE)
+pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. $(if $(MULTIBYTE),--multibyte=$(MULTIBYTE)) $(NOLOCALE)
check: all tablespace-setup
$(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF)