diff options
| author | Peter Eisentraut | 2011-04-15 05:42:05 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2011-04-15 05:42:05 +0000 |
| commit | f536d4194293f900577c728bfa4e62075a4c7da0 (patch) | |
| tree | 4fb99846394d5cd65257f23e3f6d6e764b717e17 /src/Makefile.global.in | |
| parent | 98eded936c1e81e6af5a4228ba3eb7b6352d6c91 (diff) | |
Rename pg_regress option --multibyte to --encoding
Also refactor things a little bit so that the same methods for setting
test locale and encoding can be used everywhere.
Diffstat (limited to 'src/Makefile.global.in')
| -rw-r--r-- | src/Makefile.global.in | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 69512ac643..56f282712d 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -430,8 +430,14 @@ submake-libpgport: PL_TESTDB = pl_regression CONTRIB_TESTDB = contrib_regression -pg_regress_check = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --temp-install=./tmp_check --top-builddir=$(top_builddir) -pg_regress_installcheck = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir=$(PSQLDIR) +ifdef NO_LOCALE +NOLOCALE += --no-locale +endif + +pg_regress_locale_flags = $(if $(ENCODING),--encoding=$(ENCODING)) $(NOLOCALE) + +pg_regress_check = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --temp-install=./tmp_check --top-builddir=$(top_builddir) $(pg_regress_locale_flags) +pg_regress_installcheck = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir=$(PSQLDIR) $(pg_regress_locale_flags) pg_regress_clean_files = results/ regression.diffs regression.out tmp_check/ log/ |