diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2017-03-25 00:28:28 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2017-03-25 00:30:26 -0400 |
| commit | e148009740f91ecc9555227d0d52ac43df30e6ed (patch) | |
| tree | 0c0442f52c5a970b284e23bc1dc7b4d9a0bd3017 | |
| parent | cd07f73d3225c092f4cd0e7bf1cab11ac9f8c1f0 (diff) | |
| download | postgresql-e148009740f91ecc9555227d0d52ac43df30e6ed.tar.gz postgresql-e148009740f91ecc9555227d0d52ac43df30e6ed.zip | |
Remove ICU tests from default run
These tests require the test database to be in UTF8 encoding. Until
there is a better solution, take them out of the default test set and
treat them like the existing collate.linux.utf8 test, meaning it has to
be selected manually.
| -rw-r--r-- | doc/src/sgml/regress.sgml | 6 | ||||
| -rw-r--r-- | src/test/regress/GNUmakefile | 3 | ||||
| -rw-r--r-- | src/test/regress/expected/collate.icu.utf8.out (renamed from src/test/regress/expected/collate.icu.out) | 0 | ||||
| -rw-r--r-- | src/test/regress/sql/collate.icu.utf8.sql (renamed from src/test/regress/sql/collate.icu.sql) | 0 |
4 files changed, 4 insertions, 5 deletions
diff --git a/doc/src/sgml/regress.sgml b/doc/src/sgml/regress.sgml index 89e765ea3ab..b9d1af87071 100644 --- a/doc/src/sgml/regress.sgml +++ b/doc/src/sgml/regress.sgml @@ -264,10 +264,12 @@ make check EXTRA_TESTS=numeric_big </screen> To run the collation tests: <screen> -make check EXTRA_TESTS=collate.linux.utf8 LANG=en_US.utf8 +make check EXTRA_TESTS='collate.icu.utf8 collate.linux.utf8' LANG=en_US.utf8 </screen> The <literal>collate.linux.utf8</> test works only on Linux/glibc - platforms, and only when run in a database that uses UTF-8 encoding. + platforms. The <literal>collate.icu.utf8</literal> test only works when + support for ICU was built. Both tests will only succeed when run in a + database that uses UTF-8 encoding. </para> </sect2> diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index a747facb9af..b923ea14203 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -125,9 +125,6 @@ tablespace-setup: ## REGRESS_OPTS = --dlpath=. $(EXTRA_REGRESS_OPTS) -ifeq ($(with_icu),yes) -override EXTRA_TESTS := collate.icu $(EXTRA_TESTS) -endif check: all tablespace-setup $(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(EXTRA_TESTS) diff --git a/src/test/regress/expected/collate.icu.out b/src/test/regress/expected/collate.icu.utf8.out index e1fc9984f2f..e1fc9984f2f 100644 --- a/src/test/regress/expected/collate.icu.out +++ b/src/test/regress/expected/collate.icu.utf8.out diff --git a/src/test/regress/sql/collate.icu.sql b/src/test/regress/sql/collate.icu.utf8.sql index ef39445b301..ef39445b301 100644 --- a/src/test/regress/sql/collate.icu.sql +++ b/src/test/regress/sql/collate.icu.utf8.sql |