From e148009740f91ecc9555227d0d52ac43df30e6ed Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Sat, 25 Mar 2017 00:28:28 -0400
Subject: [PATCH] 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.
---
 doc/src/sgml/regress.sgml                                   | 6 ++++--
 src/test/regress/GNUmakefile                                | 3 ---
 .../expected/{collate.icu.out => collate.icu.utf8.out}      | 0
 .../regress/sql/{collate.icu.sql => collate.icu.utf8.sql}   | 0
 4 files changed, 4 insertions(+), 5 deletions(-)
 rename src/test/regress/expected/{collate.icu.out => collate.icu.utf8.out} (100%)
 rename src/test/regress/sql/{collate.icu.sql => collate.icu.utf8.sql} (100%)

diff --git a/doc/src/sgml/regress.sgml b/doc/src/sgml/regress.sgml
index 89e765ea3a..b9d1af8707 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 a747facb9a..b923ea1420 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
similarity index 100%
rename from src/test/regress/expected/collate.icu.out
rename to 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
similarity index 100%
rename from src/test/regress/sql/collate.icu.sql
rename to src/test/regress/sql/collate.icu.utf8.sql