Added ifcapable utf16 to a few test cases;

FossilOrigin-Name: 57e0919b08e3b839b7c71011707a19ae2511a625

diff --git a/manifest b/manifest
index 9b8d4f0d8e4c5dc72293934f846d45a47a6a1368..45c864c026a5761106ae124c2bd1ffbe9ebf59ec 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\sfor\sconsistent\suse\sof\sSQLITE_OS_UNIX\sand\sremoval\sof\slegacy\sOS_UNIX\sfrom\stestfixture\ssource;
-D 2011-04-04T21:48:01.840
+C Added\sifcapable\sutf16\sto\sa\sfew\stest\scases;
+D 2011-04-05T02:21:04.887
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -368,7 +368,7 @@ F test/e_createtable.test b40fc61bc4f1ad2a3c84590bd1d711507263d921
 F test/e_delete.test 55d868b647acc091c261a10b9b0cb0ab660a6acb
 F test/e_droptrigger.test ddd4b28ed8a3d81bd5153fa0ab7559529a2ca03a
 F test/e_dropview.test b347bab30fc8de67b131594b3cd6f3d3bdaa753d
-F test/e_expr.test 4e004d1f5187d4bbc9ca3d55660a8d164dd59f4e
+F test/e_expr.test 9e8b9790803df4de23c2d68d566959934a6179d4
 F test/e_fkey.test 38039b840ab19331000b0f0eb1d82baa7208a67a
 F test/e_fts3.test 75bb0aee26384ef586165e21018a17f7cd843469
 F test/e_insert.test 7390c2da39f16a134dc9a439144768c727757d2c
@@ -545,7 +545,7 @@ F test/lock_common.tcl d279887a0ab16cdb6d935c1203e64113c5a000e9
 F test/lookaside.test 93f07bac140c5bb1d49f3892d2684decafdc7af2
 F test/main.test 9d7bbfcc1b52c88ba7b2ba6554068ecf9939f252
 F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9
-F test/malloc.test 927e6c8668a1d48c23aa6189bda02aff5a1b83de
+F test/malloc.test e56c9c3358da2c18385aea15a42dc970913986c2
 F test/malloc3.test 4128b1e6ffa506103b278ad97af89174f310c7ca
 F test/malloc4.test 957337613002b7058a85116493a262f679f3a261
 F test/malloc5.test 4d16d1bb26d2deddd7c4f480deec341f9b2d0e22
@@ -926,7 +926,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P a97e8505f229e05bf97ef9edbe063a52b581f339
-R 5b669314f67a239a5a132606db5a0d1b
+P 78b6eee200cab363be520d771375e44898f80e01
+R f54fb099162c6d5644e37dc8b0ce9ec9
 U shaneh
-Z 849485c22ade8d3120493afa3548d370
+Z afef9bcfe286e0cf65b249bd959c3b3b

diff --git a/manifest.uuid b/manifest.uuid
index 89ec5b7576dd24dc0588b41a99ecbdc0752f10ff..e3a4a1dab0829871b1e19889ad28886aebbee264 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-78b6eee200cab363be520d771375e44898f80e01
\ No newline at end of file
+57e0919b08e3b839b7c71011707a19ae2511a625
\ No newline at end of file

diff --git a/test/e_expr.test b/test/e_expr.test
index 437e88b1d8dc7f14fb786426417d177b02f9c023..1e7685352e69049ef7ea9d020be3a0214e750c60 100644 (file)
--- a/test/e_expr.test
+++ b/test/e_expr.test
@@ -1444,16 +1444,20 @@ do_qexpr_test e_expr-27.4.2 { CAST(456 AS blob) }   X'343536'
 do_qexpr_test e_expr-27.4.3 { CAST(1.78 AS blob) }  X'312E3738'
 rename db db2
 sqlite3 db :memory:
+ifcapable {utf16} {
 db eval { PRAGMA encoding = 'utf-16le' }
 do_qexpr_test e_expr-27.4.4 { CAST('ghi' AS blob) } X'670068006900'
 do_qexpr_test e_expr-27.4.5 { CAST(456 AS blob) }   X'340035003600'
 do_qexpr_test e_expr-27.4.6 { CAST(1.78 AS blob) }  X'31002E0037003800'
+}
 db close
 sqlite3 db :memory:
 db eval { PRAGMA encoding = 'utf-16be' }
+ifcapable {utf16} {
 do_qexpr_test e_expr-27.4.7 { CAST('ghi' AS blob) } X'006700680069'
 do_qexpr_test e_expr-27.4.8 { CAST(456 AS blob) }   X'003400350036'
 do_qexpr_test e_expr-27.4.9 { CAST(1.78 AS blob) }  X'0031002E00370038'
+}
 db close
 rename db2 db
 
@@ -1466,8 +1470,10 @@ do_expr_test e_expr-28.1.2 { CAST (X'670068006900' AS text) } text g
 rename db db2
 sqlite3 db :memory:
 db eval { PRAGMA encoding = 'utf-16le' }
+ifcapable {utf16} {
 do_expr_test e_expr-28.1.3 { CAST (X'676869' AS text) == 'ghi' } integer 0
 do_expr_test e_expr-28.1.4 { CAST (X'670068006900' AS text) } text ghi
+}
 db close
 rename db2 db
 
@@ -1493,6 +1499,7 @@ do_expr_test e_expr-29.1.3 { CAST (X'2D392E3837' AS REAL) } real -9.87
 do_expr_test e_expr-29.1.4 { CAST (X'302E30303031' AS REAL) } real 0.0001
 rename db db2
 sqlite3 db :memory:
+ifcapable {utf16} {
 db eval { PRAGMA encoding = 'utf-16le' }
 do_expr_test e_expr-29.1.5 { 
     CAST (X'31002E0032003300' AS REAL) } real 1.23
@@ -1502,6 +1509,7 @@ do_expr_test e_expr-29.1.7 {
     CAST (X'2D0039002E0038003700' AS REAL) } real -9.87
 do_expr_test e_expr-29.1.8 { 
     CAST (X'30002E003000300030003100' AS REAL) } real 0.0001
+}
 db close
 rename db2 db
 
@@ -1543,6 +1551,7 @@ do_expr_test e_expr-30.1.4 {
 
 rename db db2
 sqlite3 db :memory:
+ifcapable {utf16} {
 execsql { PRAGMA encoding = 'utf-16be' }
 do_expr_test e_expr-30.1.5 { CAST(X'003100320033' AS INTEGER) } integer 123
 do_expr_test e_expr-30.1.6 { CAST(X'002D003600370038' AS INTEGER) } integer -678
@@ -1552,6 +1561,7 @@ do_expr_test e_expr-30.1.7 {
 do_expr_test e_expr-30.1.8 { 
   CAST(X'002D0031003100320035003800390039003900300036003800340032003600320034' AS INTEGER) 
 } integer -1125899906842624
+}
 db close
 rename db2 db
 
@@ -1632,6 +1642,7 @@ do_expr_test e_expr-32.2.4 {
 # into a non-BLOB value may be different depending on whether the
 # database encoding is UTF-8, UTF-16be, or UTF-16le.
 #
+ifcapable {utf16} {
 sqlite3 db1 :memory: ; db1 eval { PRAGMA encoding = 'utf-8' }
 sqlite3 db2 :memory: ; db2 eval { PRAGMA encoding = 'utf-16le' }
 sqlite3 db3 :memory: ; db3 eval { PRAGMA encoding = 'utf-16be' }
@@ -1658,6 +1669,7 @@ foreach {tn castexpr differs} {
 db1 close
 db2 close
 db3 close
+}
 
 #-------------------------------------------------------------------------
 # Test statements related to the EXISTS and NOT EXISTS operators.

diff --git a/test/malloc.test b/test/malloc.test
index f1eee17ecd0bacf1da09574cd113c805692032b8..678b2be075fe8e2f831790c123f4e4b0f7f7032d 100644 (file)
--- a/test/malloc.test
+++ b/test/malloc.test
@@ -867,7 +867,7 @@ if {[db eval {PRAGMA locking_mode}]!="exclusive"} {
   catch { db2 close }
 }
 
-ifcapable stat2 {
+ifcapable stat2&&utf16 {
   do_malloc_test 38 -tclprep {
     add_test_collate db 0 0 1
     execsql {