Changes to test code (only) to allow veryquick.test to run with OMIT_UTF16 builsd...

FossilOrigin-Name: 7f3fc7f20f6dc205eedbe445e35f5071f1c01185

diff --git a/manifest b/manifest
index b213b2c34790f3573a2f70d36cd6c5e6c1ccb14f..83a98d169799f57e1e7531b07e1e1ae14b40070d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sALWAYS()\sfrom\sa\scondition\sthat\scan\sin\sfact\sbe\sfalse\sunder\svery\nobscure\scircumstances.\s(CVS\s6918)
-D 2009-07-22T02:02:40
+C Changes\sto\stest\scode\s(only)\sto\sallow\sveryquick.test\sto\srun\swith\sOMIT_UTF16\sbuilsd.\sTicket\s#3985.\s(CVS\s6919)
+D 2009-07-22T07:27:57
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in df9359da7a726ccb67a45db905c5447d5c00c6ef
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -183,7 +183,7 @@ F src/test_backup.c 1384a18985a5a2d275c2662e48473bf1542ebd08
 F src/test_btree.c 5adbba9b138988a3cf4d3b5424dbc7c85651da02
 F src/test_config.c 63d1b08809ca182ee75429573111b44735861c64
 F src/test_devsym.c 9f4bc2551e267ce7aeda195f3897d0f30c5228f4
-F src/test_func.c b8140bc4ed0d290d5e22972eb2a3bfd40aa798dc
+F src/test_func.c 26ac62d8ed7a9f45a1e05baffb1c1e55fe2a06f2
 F src/test_hexio.c 2f1122aa3f012fa0142ee3c36ce5c902a70cd12f
 F src/test_journal.c dab49b7c47b53242f039c9563b18cafb67ebfe03
 F src/test_loadext.c 97dc8800e46a46ed002c2968572656f37e9c0dd9
@@ -247,7 +247,7 @@ F test/badutf.test d5360fc31f643d37a973ab0d8b4fb85799c3169f
 F test/between.test 16b1776c6323faadb097a52d673e8e3d8be7d070
 F test/bigfile.test b746a34ce0e2039994b45fea8b7fbfa78f594cdf
 F test/bigrow.test f0aeb7573dcb8caaafea76454be3ade29b7fc747
-F test/bind.test 455f7e8322a215e245414625eede3ab0e1429c14
+F test/bind.test 3c7b320969000c441a70952b0b15938fbb66237c
 F test/bindxfer.test efecd12c580c14df5f4ad3b3e83c667744a4f7e0
 F test/bitvec.test 75894a880520164d73b1305c1c3f96882615e142
 F test/blob.test e7ac6c7d3a985cc4678c64f325292529a69ae252
@@ -264,7 +264,7 @@ F test/cache.test 3ff445c445742a7b6b9ba6e1d62a25263f9424b9
 F test/capi2.test 172c717ed101e78e0798dd21b9896a22366f35b4
 F test/capi3.test 168e2cd66c58c510955b0f299750e4de73b8d952
 F test/capi3b.test 664eb55318132f292f2c436f90906f578cad6b97
-F test/capi3c.test ce0fcbbaccfc9703fb247ea9ac5ada96dc9ca047
+F test/capi3c.test 946a95fc028c967aa6d9c8f6f527d1d3a748b68a
 F test/capi3d.test 57d83b690d7364bde02cddbf8339a4b50d80ce23
 F test/cast.test 166951664a0b0a2e0f8fb5997a152490c6363932
 F test/check.test b897cd3cc839b34b31cdd073e9882ccd03da977b
@@ -741,7 +741,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P 96cfd079528501f6f1e658ce8a5a4e3bdea729be
-R a8bd2be33969844ee5d481d489c419c7
-U drh
-Z bc1c68166bf29dbfc1cab9b7c7ad4f50
+P 38083228956ac05df45f44447ab39c64852239d2
+R 0cab1d6c65cf9787978529fe99839bb1
+U danielk1977
+Z d43492bf0989c2fd5cef71cedc911350

diff --git a/manifest.uuid b/manifest.uuid
index deca36d08ac140b35ffd3f64f989fca798a09228..6635184677489c2b2d0d907fc82440f27c6b96c4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-38083228956ac05df45f44447ab39c64852239d2
\ No newline at end of file
+7f3fc7f20f6dc205eedbe445e35f5071f1c01185
\ No newline at end of file

diff --git a/src/test_func.c b/src/test_func.c
index c8990cc83688cb0976e933058595c0884bd07c08..d0f47d400e3e21680dbf36d668007e5a830df113 100644 (file)
--- a/src/test_func.c
+++ b/src/test_func.c
@@ -12,7 +12,7 @@
 ** Code for testing all sorts of SQLite interfaces.  This code
 ** implements new SQL functions used by the test scripts.
 **
-** $Id: test_func.c,v 1.15 2009/05/07 13:43:49 drh Exp $
+** $Id: test_func.c,v 1.16 2009/07/22 07:27:57 danielk1977 Exp $
 */
 #include "sqlite3.h"
 #include "tcl.h"
@@ -156,6 +156,7 @@ void sqlite3EndBenignMalloc(void);
 static void test_agg_errmsg16_step(sqlite3_context *a, int b,sqlite3_value **c){
 }
 static void test_agg_errmsg16_final(sqlite3_context *ctx){
+#ifndef SQLITE_OMIT_UTF16
   const void *z;
   sqlite3 * db = sqlite3_context_db_handle(ctx);
   sqlite3_aggregate_context(ctx, 2048);
@@ -163,6 +164,7 @@ static void test_agg_errmsg16_final(sqlite3_context *ctx){
   z = sqlite3_errmsg16(db);
   sqlite3EndBenignMalloc();
   sqlite3_result_text16(ctx, z, -1, SQLITE_TRANSIENT);
+#endif
 }
 
 /*

diff --git a/test/bind.test b/test/bind.test
index da0bf94318c55e7df597a6d5b79303759b9330cc..34f3155b95253a3f9b740f2ffa2c9fbdd276edee 100644 (file)
--- a/test/bind.test
+++ b/test/bind.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script testing the sqlite_bind API.
 #
-# $Id: bind.test,v 1.47 2009/02/20 03:55:05 drh Exp $
+# $Id: bind.test,v 1.48 2009/07/22 07:27:57 danielk1977 Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -291,7 +291,7 @@ do_test bind-6.4 {
   execsql {SELECT * FROM t1}
 } {hello hello hello}
 set enc [db eval {PRAGMA encoding}]
-if {$enc=="UTF-8"} {
+if {$enc=="UTF-8" || $enc==""} {
   do_test bind-6.5 {
     execsql {SELECT  hex(a), hex(b), hex(c) FROM t1}
   } {68656C6C6F00746865726500 68656C6C6F007468657265 68656C6C6F}

diff --git a/test/capi3c.test b/test/capi3c.test
index 94deb1140580dcf95522b9a3670314d74169b169..fd5eaeaa59086edd1f91b525ac1dac200e1622b4 100644 (file)
--- a/test/capi3c.test
+++ b/test/capi3c.test
@@ -13,7 +13,7 @@
 # This is a copy of the capi3.test file that has been adapted to
 # test the new sqlite3_prepare_v2 interface.
 #
-# $Id: capi3c.test,v 1.22 2008/11/05 16:37:35 drh Exp $
+# $Id: capi3c.test,v 1.23 2009/07/22 07:27:57 danielk1977 Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -1292,31 +1292,33 @@ sqlite3_finalize $STMT
 # conversion (or vice versa) on one column does not change the value of
 # the second.
 #
-do_test capi3c-23.1 {
-  set STMT [sqlite3_prepare_v2 db {SELECT b,b,b,b FROM t1} -1 TAIL]
-  sqlite3_step $STMT
-} {SQLITE_ROW}
-do_test capi3c-23.2 {
-  sqlite3_column_text16 $STMT 0
-  sqlite3_column_text $STMT 1
-} {one}
-do_test capi3c-23.3 {
-  sqlite3_column_text16 $STMT 2
-  sqlite3_column_text $STMT 3
-} {one}
-sqlite3_finalize $STMT
-do_test capi3c-23.4 {
-  set STMT [sqlite3_prepare_v2 db {SELECT b||'x',b,b,b FROM t1} -1 TAIL]
-  sqlite3_step $STMT
-} {SQLITE_ROW}
-do_test capi3c-23.5 {
-  sqlite3_column_text16 $STMT 0
-  sqlite3_column_text $STMT 1
-} {one}
-do_test capi3c-23.6 {
-  sqlite3_column_text16 $STMT 2
-  sqlite3_column_text $STMT 3
-} {one}
-sqlite3_finalize $STMT
+ifcapable utf16 {
+  do_test capi3c-23.1 {
+    set STMT [sqlite3_prepare_v2 db {SELECT b,b,b,b FROM t1} -1 TAIL]
+    sqlite3_step $STMT
+  } {SQLITE_ROW}
+  do_test capi3c-23.2 {
+    sqlite3_column_text16 $STMT 0
+    sqlite3_column_text $STMT 1
+  } {one}
+  do_test capi3c-23.3 {
+    sqlite3_column_text16 $STMT 2
+    sqlite3_column_text $STMT 3
+  } {one}
+  sqlite3_finalize $STMT
+  do_test capi3c-23.4 {
+    set STMT [sqlite3_prepare_v2 db {SELECT b||'x',b,b,b FROM t1} -1 TAIL]
+    sqlite3_step $STMT
+  } {SQLITE_ROW}
+  do_test capi3c-23.5 {
+    sqlite3_column_text16 $STMT 0
+    sqlite3_column_text $STMT 1
+  } {one}
+  do_test capi3c-23.6 {
+    sqlite3_column_text16 $STMT 2
+    sqlite3_column_text $STMT 3
+  } {one}
+  sqlite3_finalize $STMT
+}
 
 finish_test