Adjust ICU tests to account for recent changes in the official

Unicode definition of whitespace.

FossilOrigin-Name: 0816525386ac51454b7b09a507e45b6a2cb8bf6e

diff --git a/manifest b/manifest
index a8b3ea00d4e6241c2e01c9ee350243d91f2c58f1..739702bb43c2ed0edc0253fac923e9e0444adbd9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sharmless\scomment\stypo.\s\sNo\scode\schanges.
-D 2015-06-15T16:09:35.833
+C Adjust\sICU\stests\sto\saccount\sfor\srecent\schanges\sin\sthe\sofficial\s\nUnicode\sdefinition\sof\swhitespace.
+D 2015-06-15T16:40:38.658
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 1063c58075b7400d93326b0eb332b48a54f53025
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -644,7 +644,7 @@ F test/fts4merge2.test 5faa558d1b672f82b847d2a337465fa745e46891
 F test/fts4merge3.test aab02a09f50fe6baaddc2e159c3eabc116d45fc7
 F test/fts4merge4.test d895b1057a7798b67e03455d0fa50e9ea836c47b
 F test/fts4noti.test 524807f0c36d49deea7920cdd4cd687408b58849
-F test/fts4unicode.test 01ec3fe2a7c3cfff3b4c0581b83caa11b33efa36
+F test/fts4unicode.test 27378af76394542cf490cf001d8d1505fe55f6a9
 F test/full.test 6b3c8fb43c6beab6b95438c1675374b95fab245d
 F test/func.test ae97561957aba6ca9e3a7b8a13aac41830d701ef
 F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
@@ -1286,7 +1286,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P b0badb99023e23bef0e2064cec58f2b279af0c0b
-R c7949b921102cce9b301519c2fb02c1a
+P ae6876521819e7a8ce473c8f96617cba35e2156d
+R a07fe181e35e9a94a47adc71c8d7ce80
 U drh
-Z 103d93c1867cc9ff7fdf7b89d6bdddd9
+Z bb1a4c355eadbeb14b6625f3b7a90f48

diff --git a/manifest.uuid b/manifest.uuid
index 0d16e36253a046fd63de0c91bf03a4158f46b27b..20cb583453f4a0ae2b9d5e39d8e22a6aa59b2f95 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ae6876521819e7a8ce473c8f96617cba35e2156d
\ No newline at end of file
+0816525386ac51454b7b09a507e45b6a2cb8bf6e
\ No newline at end of file

diff --git a/test/fts4unicode.test b/test/fts4unicode.test
index f237119a1871b250da71515ad124aa2de706f19d..500cfcdcaa7e74cdeb2c2186337a809ccb9cd8b4 100644 (file)
--- a/test/fts4unicode.test
+++ b/test/fts4unicode.test
@@ -362,11 +362,17 @@ ifcapable icu { lappend tokenizers icu }
 # Some tests to check that the tokenizers can both identify white-space 
 # codepoints. All codepoints tested below are of type "Zs" in the
 # UnicodeData.txt file.
+#
+# Note that codepoint 6158 has changed from Zs to Cf in recent versions
+# of UnicodeData.txt.  So take that into account for the "icu" tests.
+#
 foreach T $tokenizers {
   do_isspace_test 6.$T.1 $T    32
   do_isspace_test 6.$T.2 $T    160
   do_isspace_test 6.$T.3 $T    5760
-  do_isspace_test 6.$T.4 $T    6158
+  if {$T!="icu"} {
+    do_isspace_test 6.$T.4 $T    6158
+  }
   do_isspace_test 6.$T.5 $T    8192
   do_isspace_test 6.$T.6 $T    8193
   do_isspace_test 6.$T.7 $T    8194
@@ -382,7 +388,11 @@ foreach T $tokenizers {
   do_isspace_test 6.$T.17 $T    8287
   do_isspace_test 6.$T.18 $T   12288
 
-  do_isspace_test 6.$T.19 $T   {32 160 5760 6158}
+  if {$T!="icu"} {
+    do_isspace_test 6.$T.19 $T   {32 160 5760 6158}
+  } else {
+    do_isspace_test 6.$T.19 $T   {32 160 5760 8192}
+  }
   do_isspace_test 6.$T.20 $T   {8192 8193 8194 8195}
   do_isspace_test 6.$T.21 $T   {8196 8197 8198 8199}
   do_isspace_test 6.$T.22 $T   {8200 8201 8202 8239}