Adjust a couple of test scripts so that they work with OMIT_UTF16 builds.

FossilOrigin-Name: 6c51bad0a306558d2725463b5675c3799fabcb9d

diff --git a/manifest b/manifest
index 291bcdee80b6a0c98c988145614e701590b3318f..15ccd8161fe0dfc56cc2ab0ec7d982c8012d020e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\stestcase\smacro\sto\sensure\stesting\sa\sboundary\scase\sin\sDISTINCT\sprocessing.
-D 2011-07-02T19:12:05.917
+C Adjust\sa\scouple\sof\stest\sscripts\sso\sthat\sthey\swork\swith\sOMIT_UTF16\sbuilds.
+D 2011-07-04T06:52:15.309
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -486,7 +486,7 @@ F test/fts3sort.test 63d52c1812904b751f9e1ff487472e44833f5402
 F test/fts4aa.test 148d9eb54901af23b5d402b1f388f43e559e1728
 F test/func.test 6c5ce11e3a0021ca3c0649234e2d4454c89110ca
 F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
-F test/func3.test 7ba2ca5a1e9bca900ba2c230cf04bd67184bc1bc
+F test/func3.test 001021e5b88bd02a3b365a5c5fd8f6f49d39744a
 F test/fuzz.test 77fd50afc12847af50fcf1941679d90adebadde6
 F test/fuzz2.test 207d0f9d06db3eaf47a6b7bfc835b8e2fc397167
 F test/fuzz3.test aec64345184d1662bd30e6a17851ff659d596dc5
@@ -680,7 +680,7 @@ F test/speed3.test 5a419039e9da95d906adb2298af2849600c81c11
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
-F test/sqllimits1.test e90a0ed94452076f6a10209d378e06b5f75ef0a0
+F test/sqllimits1.test 0ebf7bed0b99c96f24e0b7fa5e59dbc42359c421
 F test/stat.test c7b20ea43003dc2dc33335e231c27be8284c4a2a
 F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
 F test/subquery.test b524f57c9574b2c0347045b4510ef795d4686796
@@ -950,7 +950,7 @@ F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
-P 27c65d4d9c58bfc4ea8f9337fa15090459fb26c5
-R 31108ab0f55c59747082de8c46c3b2b9
-U drh
-Z d273315218f9229b31cebba00fe83934
+P ff9fc722dc481df1ce6a9733db1f033b88141d5d
+R f023392f9f22f7fc5dcd77586a5f9e95
+U dan
+Z 70ce870889abf3a5e434fe4697977568

diff --git a/manifest.uuid b/manifest.uuid
index e10d1d6e889505a946f4f1721844423914add239..6a5de2af4796e907934126eaa12c9de2864e8d89 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ff9fc722dc481df1ce6a9733db1f033b88141d5d
\ No newline at end of file
+6c51bad0a306558d2725463b5675c3799fabcb9d
\ No newline at end of file

diff --git a/test/func3.test b/test/func3.test
index e58d730f3a32410d9375f792e7dbc8c1d540b60f..d5a462fe33e44f0e7fecf26576656d10d5ea70b2 100644 (file)
--- a/test/func3.test
+++ b/test/func3.test
@@ -17,24 +17,26 @@ set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
 
-do_test func3-1.1 {
-  set destroyed 0
-  proc destroy {} { set ::destroyed 1 }
-  sqlite3_create_function_v2 db f2 -1 any -func f2 -destroy destroy
-  set destroyed
-} 0
-do_test func3-1.2 {
-  sqlite3_create_function_v2 db f2 -1 utf8 -func f2
-  set destroyed
-} 0
-do_test func3-1.3 {
-  sqlite3_create_function_v2 db f2 -1 utf16le -func f2
-  set destroyed
-} 0
-do_test func3-1.4 {
-  sqlite3_create_function_v2 db f2 -1 utf16be -func f2
-  set destroyed
-} 1
+ifcapable utf16 {
+  do_test func3-1.1 {
+    set destroyed 0
+    proc destroy {} { set ::destroyed 1 }
+    sqlite3_create_function_v2 db f2 -1 any -func f2 -destroy destroy
+    set destroyed
+  } 0
+  do_test func3-1.2 {
+    sqlite3_create_function_v2 db f2 -1 utf8 -func f2
+    set destroyed
+  } 0
+  do_test func3-1.3 {
+    sqlite3_create_function_v2 db f2 -1 utf16le -func f2
+    set destroyed
+  } 0
+  do_test func3-1.4 {
+    sqlite3_create_function_v2 db f2 -1 utf16be -func f2
+    set destroyed
+  } 1
+}
 
 do_test func3-2.1 {
   set destroyed 0

diff --git a/test/sqllimits1.test b/test/sqllimits1.test
index bf4a26267823b8af9ec17c2e7f84e6a9efeadb1f..8f2521353f67a66e6544a34b5f8603ae6a01cb64 100644 (file)
--- a/test/sqllimits1.test
+++ b/test/sqllimits1.test
@@ -319,18 +319,22 @@ do_test sqllimits1-5.14.4 {
   catch {sqlite3_bind_text $::STMT 1 $::str1 -1} res
   set res
 } {SQLITE_TOOBIG}
-do_test sqllimits1-5.14.5 {
-  catch {sqlite3_bind_text16 $::STMT 1 $::str1 -1} res
-  set res
-} {SQLITE_TOOBIG}
+ifcapable utf16 {
+  do_test sqllimits1-5.14.5 {
+    catch {sqlite3_bind_text16 $::STMT 1 $::str1 -1} res
+    set res
+  } {SQLITE_TOOBIG}
+}
 do_test sqllimits1-5.14.6 {
   catch {sqlite3_bind_text $::STMT 1 $::str1 $np1} res
   set res
 } {SQLITE_TOOBIG}
-do_test sqllimits1-5.14.7 {
-  catch {sqlite3_bind_text16 $::STMT 1 $::str1 $np1} res
-  set res
-} {SQLITE_TOOBIG}
+ifcapable utf16 {
+  do_test sqllimits1-5.14.7 {
+    catch {sqlite3_bind_text16 $::STMT 1 $::str1 $np1} res
+    set res
+  } {SQLITE_TOOBIG}
+}
 do_test sqllimits1-5.14.8 {
   set n [expr {$np1-1}]
   catch {sqlite3_bind_text $::STMT 1 $::str1 $n} res