summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2017-03-25 00:28:28 -0400
committerPeter Eisentraut <peter_e@gmx.net>2017-03-25 00:30:26 -0400
commite148009740f91ecc9555227d0d52ac43df30e6ed (patch)
tree0c0442f52c5a970b284e23bc1dc7b4d9a0bd3017 /src
parentcd07f73d3225c092f4cd0e7bf1cab11ac9f8c1f0 (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/test/regress/GNUmakefile3
-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
3 files changed, 0 insertions, 3 deletions
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