Omit calls to test_destructor16() if SQLITE_OMIT_UTF16 defined. (CVS 5508)

FossilOrigin-Name: 2d5cec53c2f31875d198d81ac4fd54e7066ea0ff

diff --git a/manifest b/manifest
index de792485be11085fd7d62bdd944ca845cbb53e23..c61bc7369002f07d81c6d3e657444abfb0a4cfe6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixed\scomment\sto\suse\sright\sfunction\snames\sfor\ssqlite3VdbeSerialPut()\sand\ssqlite3VdbeSerialGet().\s(CVS\s5507)
-D 2008-07-31T01:43:14
+C Omit\scalls\sto\stest_destructor16()\sif\sSQLITE_OMIT_UTF16\sdefined.\s(CVS\s5508)
+D 2008-07-31T01:47:11
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in bbb62eecc851379aef5a48a1bf8787eb13e6ec06
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -165,7 +165,7 @@ F src/test_autoext.c f53b0cdf7bf5f08100009572a5d65cdb540bd0ad
 F src/test_btree.c 7170e0c922ed3979f2d38f4a3f84728e5740dfc3
 F src/test_config.c 7896095e9af6e3fad0e42666880afdadfbd563ac
 F src/test_devsym.c 6012cb8e3acf812513511025a4fa5d626e0ba19b
-F src/test_func.c 24a556989685495013e08f311ae31c4ef86ddb8c
+F src/test_func.c 94c4424ed9869ecf2e2132662a04581bbec016f6
 F src/test_hexio.c 2f1122aa3f012fa0142ee3c36ce5c902a70cd12f
 F src/test_loadext.c df8ab3a6481ddebbdf0d28ebac5d9e0790f7860f
 F src/test_malloc.c 398f670f29e2d0c7b7717e2ea6386693b29afa28
@@ -342,7 +342,7 @@ F test/fts3c.test 4c7ef29b37aca3e8ebb6a39b57910caa6506034e
 F test/fts3d.test d92a47fe8ed59c9e53d2d8e6d2685bb380aadadc
 F test/fts3e.test 1f6c6ac9cc8b772ca256e6b22aaeed50c9350851
 F test/fts3near.test 2d4dadcaac5025ab65bb87e66c45f39e92966194
-F test/func.test 20973677b5be7e9f199854779dae85053cc6438d
+F test/func.test ca825e3781c96b0b62d531c2d445d2df6a8cea44
 F test/fuzz.test 62fc19dd36a427777fd671b569df07166548628a
 F test/fuzz2.test ea38692ce2da99ad79fe0be5eb1a452c1c4d37bb
 F test/fuzz_common.tcl ff4bc2dfc465f6878f8e2d819620914365382731
@@ -614,7 +614,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 10e0450896a8b92b160f2e670e8d5a909c1c67ba
-R 922e56673c55621ea93c7dbe3c7c5f9d
+P 820c37ec5290d7f0030438da29b30c33400fd4e3
+R 3dc1fcdf110f66179a36d525136ab12f
 U shane
-Z b0b2e35eaa132ca7b834c0d8a8adce80
+Z 001a364b69eb4757e0498d542e8fbb94

diff --git a/manifest.uuid b/manifest.uuid
index d657f4e3502f1d7189f0e206b4457fda4f7e1d60..1b980291b6adfea9bcebc1e47845b9e53e9d6598 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-820c37ec5290d7f0030438da29b30c33400fd4e3
\ No newline at end of file
+2d5cec53c2f31875d198d81ac4fd54e7066ea0ff
\ No newline at end of file

diff --git a/src/test_func.c b/src/test_func.c
index d43b7a9f210771538f8c3bdb941769de65d41cdf..83f9730df5e28760d3c8095094963b6d79bdb8e3 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.8 2008/07/11 21:02:54 drh Exp $
+** $Id: test_func.c,v 1.9 2008/07/31 01:47:11 shane Exp $
 */
 #include "sqlite3.h"
 #include "tcl.h"
@@ -114,6 +114,7 @@ static void test_destructor(
   memcpy(zVal, sqlite3_value_text(argv[0]), len);
   sqlite3_result_text(pCtx, zVal, -1, destructor);
 }
+#ifndef SQLITE_OMIT_UTF16
 static void test_destructor16(
   sqlite3_context *pCtx, 
   int nArg,
@@ -136,6 +137,7 @@ static void test_destructor16(
   memcpy(zVal, sqlite3_value_text16(argv[0]), len);
   sqlite3_result_text16(pCtx, zVal, -1, destructor);
 }
+#endif
 static void test_destructor_count(
   sqlite3_context *pCtx, 
   int nArg,
@@ -272,7 +274,9 @@ static int registerTestFunctions(sqlite3 *db){
   } aFuncs[] = {
     { "randstr",               2, SQLITE_UTF8, randStr    },
     { "test_destructor",       1, SQLITE_UTF8, test_destructor},
+#ifndef SQLITE_OMIT_UTF16
     { "test_destructor16",     1, SQLITE_UTF8, test_destructor16},
+#endif
     { "test_destructor_count", 0, SQLITE_UTF8, test_destructor_count},
     { "test_auxdata",         -1, SQLITE_UTF8, test_auxdata},
     { "test_error",            1, SQLITE_UTF8, test_error},

diff --git a/test/func.test b/test/func.test
index 6eec6a89be722e4b652de9b629cb03e72b8fca70..d2854e9eff6b3156fbd7f3234c41b0518e218742 100644 (file)
--- a/test/func.test
+++ b/test/func.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing built-in functions.
 #
-# $Id: func.test,v 1.84 2008/07/16 18:20:09 drh Exp $
+# $Id: func.test,v 1.85 2008/07/31 01:47:11 shane Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -455,11 +455,13 @@ if {[db eval {PRAGMA encoding}]=="UTF-8"} {
     }
   } {{hello world} 1}
 } else {
-  do_test func-12.1-utf16 {
-    execsql {
-      SELECT test_destructor16('hello world'), test_destructor_count();
+    ifcapable {utf16} {
+      do_test func-12.1-utf16 {
+        execsql {
+          SELECT test_destructor16('hello world'), test_destructor_count();
+        }
+      } {{hello world} 1}
     }
-  } {{hello world} 1}
 }
 do_test func-12.2 {
   execsql {