Skip some tests in capi3e.test when compiled with SQLITE_OMIT_UTF16.

FossilOrigin-Name: b04304b9677b84c4bfca011bf7fa0488e7d56d08

diff --git a/configure b/configure
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/install-sh b/install-sh
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/manifest b/manifest
index 8943690ad0e4154a97a0d8dba4009c9dadebc3b7..053249dc49adf7c1caa73cac3ab23cd06b9a15b6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Add\sa\sNEVER()\saround\sa\stest\sthat\sis\sbelieved\sto\salways\sbe\sfalse.
-D 2011-02-11T22:54:28.272
+C Skip\ssome\stests\sin\scapi3e.test\swhen\scompiled\swith\sSQLITE_OMIT_UTF16.
+D 2011-02-14T03:49:40
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -25,7 +22,7 @@ F art/src_logo.gif 9341ef09f0e53cd44c0c9b6fc3c16f7f3d6c2ad9
 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
 F config.h.in 868fdb48c028421a203470e15c69ada15b9ba673
 F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
-F configure c38c1947db7ed4adaed2affcb09cea9d3acd5a9a x
+F configure c38c1947db7ed4adaed2affcb09cea9d3acd5a9a
 F configure.ac 87a3c71bbe9c925381c154413eea7f3cdc397244
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
@@ -101,7 +98,7 @@ F ext/rtree/rtree_util.tcl 06aab2ed5b826545bf215fff90ecb9255a8647ea
 F ext/rtree/sqlite3rtree.h 1af0899c63a688e272d69d8e746f24e76f10a3f0
 F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
 F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
-F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
+F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F main.mk 54190fab7cdba523e311c274c95ea480f32abfb5
 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
@@ -303,7 +300,7 @@ F test/capi3.test 1945a2ba75e3f4c49d5beb8fc092115b6292d471
 F test/capi3b.test efb2b9cfd127efa84433cd7a2d72ce0454ae0dc4
 F test/capi3c.test bea67403a5e37a4b33230ee4723e315a2ffb31e7
 F test/capi3d.test cd36571f014f34bdc4421967f6453cbb597d5d16
-F test/capi3e.test 4fda47388ddfbfe807987aa62f46fcbceec9327f
+F test/capi3e.test f7408dda65c92b9056199fdc180f893015f83dde
 F test/cast.test 166951664a0b0a2e0f8fb5997a152490c6363932
 F test/check.test db2b29d557544347d28e25b8406f5d5ecc3d1bc3
 F test/coalesce.test cee0dccb9fbd2d494b77234bccf9dc6c6786eb91
@@ -910,14 +907,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 559739998833643f589fa76d8360080691f83c18
-R 3f5b19b9fdaeed0c9a1e544cdd90ed14
-U drh
-Z 226a0fa1ae2a9e0748eda25192973dc9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFNVb4noxKgR168RlERAvQ0AJ9AfVQ6sjzUkWSI5YTFhrB4aQPYDACfbb5E
-PUlDcsrBnP1q8syb8/AB5Hw=
-=8g1e
------END PGP SIGNATURE-----
+P f7e2ea33d5b37e5b133d96e96a11d2842504355c
+R ffebcc687d81f6cc5775f994836234b8
+U shaneh
+Z f8fe51827f910e65ed40e955ca4f658a

diff --git a/manifest.uuid b/manifest.uuid
index 5c64f666ec17a3cfddb5f22225d6db706aaa19e9..91bad795f1341f0053078dacc46f358db0b7b30e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f7e2ea33d5b37e5b133d96e96a11d2842504355c
\ No newline at end of file
+b04304b9677b84c4bfca011bf7fa0488e7d56d08
\ No newline at end of file

diff --git a/test/capi3e.test b/test/capi3e.test
index 388c17bea02d845f52e1e5f782737f1af0da535c..21304cb8e6e424d1f2d7cde2840faf5553e42e60 100644 (file)
--- a/test/capi3e.test
+++ b/test/capi3e.test
@@ -77,22 +77,24 @@ foreach name $names {
   } {1}
 }
 
-set i 0
-foreach name $names {
-  incr i
-  do_test capi3e-2.1.$i {
-    set db2 [sqlite3_open16 [utf16 $name] {}]
-    sqlite3_errcode $db2
-  } {SQLITE_OK}
-  do_test capi3e-2.2.$i {
-    sqlite3_close $db2
-  } {SQLITE_OK}
-  do_test capi3e-2.3.$i {
-    file isfile $name
-  } {1}
+ifcapable {utf16} {
+  set i 0
+  foreach name $names {
+    incr i
+    do_test capi3e-2.1.$i {
+      set db2 [sqlite3_open16 [utf16 $name] {}]
+      sqlite3_errcode $db2
+    } {SQLITE_OK}
+    do_test capi3e-2.2.$i {
+      sqlite3_close $db2
+    } {SQLITE_OK}
+    do_test capi3e-2.3.$i {
+      file isfile $name
+    } {1}
+  }
 }
 
-ifcapable attach {\r
+ifcapable attach {
   do_test capi3e-3.1 {
     sqlite3 db2 base.db
   } {}