Minor changes to test scripts to support various SQLITE_OMIT options.

FossilOrigin-Name: 97f8a886b6314b044a0522a88f569798fdfb3ef9

diff --git a/manifest b/manifest
index 551534defc0dac89c32001975c21e0535fe4095d..48e625c529772eedb16e2bfe6af3d3629ea9119d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\sto\sremove\swarnings\sin\sMSVC\sbuild.
-D 2009-12-31T19:06:24
+C Minor\schanges\sto\stest\sscripts\sto\ssupport\svarious\sSQLITE_OMIT\soptions.
+D 2009-12-31T19:48:29
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -275,7 +275,7 @@ F test/capi3b.test 664eb55318132f292f2c436f90906f578cad6b97
 F test/capi3c.test d9d293ce8fd4dc2944ce2dae5718fc7a6184a567
 F test/capi3d.test 57d83b690d7364bde02cddbf8339a4b50d80ce23
 F test/cast.test 166951664a0b0a2e0f8fb5997a152490c6363932
-F test/check.test b897cd3cc839b34b31cdd073e9882ccd03da977b
+F test/check.test db2b29d557544347d28e25b8406f5d5ecc3d1bc3
 F test/coalesce.test cee0dccb9fbd2d494b77234bccf9dc6c6786eb91
 F test/collate1.test e3eaa48c21e150814be1a7b852d2a8af24458d04
 F test/collate2.test 04cebe4a033be319d6ddbb3bbc69464e01700b49
@@ -408,7 +408,7 @@ F test/fts3rnd.test 654daa6206f9d63ed3388858c60bba3fd4004a5f
 F test/func.test af106ed834001738246d276659406823e35cde7b
 F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
 F test/fuzz.test a4174c3009a3e2c2e14b31b364ebf7ddb49de2c9
-F test/fuzz2.test ea38692ce2da99ad79fe0be5eb1a452c1c4d37bb
+F test/fuzz2.test 207d0f9d06db3eaf47a6b7bfc835b8e2fc397167
 F test/fuzz3.test aec64345184d1662bd30e6a17851ff659d596dc5
 F test/fuzz_common.tcl a87dfbb88c2a6b08a38e9a070dabd129e617b45b
 F test/fuzz_malloc.test 4eca9d345f06d5b0b0105f7a2ef9e7f22658827b
@@ -543,7 +543,7 @@ F test/savepoint3.test e328085853b14898d78ceea00dfe7db18bb6a9ec
 F test/savepoint4.test c8f8159ade6d2acd9128be61e1230f1c1edc6cc0
 F test/savepoint5.test 0735db177e0ebbaedc39812c8d065075d563c4fd
 F test/savepoint6.test 2df1d093e59e78d688c64eb20e0457aaea7d08f9
-F test/schema.test 3d8b19e3cf1105929940d387e3577da5a58d8fc0
+F test/schema.test 23a2909d2b1f8494d28d355c1254f075b0af8ffc
 F test/schema2.test 906408621ea881fdb496d878b1822572a34e32c5
 F test/select1.test f67ca2dfc05df41c7b86eb32ca409b427a5f43b0
 F test/select2.test 9735da20ccd41e42bf2b4c19fd939141b591adae
@@ -603,7 +603,7 @@ F test/threadtest1.c 6029d9c5567db28e6dc908a0c63099c3ba6c383b
 F test/threadtest2.c ace893054fa134af3fc8d6e7cfecddb8e3acefb9
 F test/tkt-2ea2425d34.test 1cf13e6f75d149b3209a0cb32927a82d3d79fb28
 F test/tkt-31338dca7e.test 5741cd48de500347a437ba1be58c8335e83c5a5e
-F test/tkt-3fe897352e.test 8084dad39807eac10b10720c84193bd1a5980973
+F test/tkt-3fe897352e.test 10de1a67bd5c66b238a4c96abe55531b37bb4f00
 F test/tkt-4a03edc4c8.test 2865e4edbc075b954daa82f8da7cc973033ec76e
 F test/tkt-5ee23731f.test 3581260f2a71e51db94e1506ba6b0f7311d002a9
 F test/tkt-78e04e52ea.test fb5430c675e708f5cbafdf3e7e5593da5145a527
@@ -783,7 +783,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 6b4fcd81e775ff4c5d7bc454378555cf73cf5772
-R fd95eb4173f58c5b727a9b9b7202bcea
+P 6cf76c2ae25d6e58926637ecd42eed6b300b1a25
+R a3c177701c76e1795362a375d5a00fd7
 U shaneh
-Z f91f2ffe2dc04d5879652cb91a55023e
+Z 4cd33a23217680a7f9bd034ed143d288

diff --git a/manifest.uuid b/manifest.uuid
index a35ba08f5e092613c122219174acbd2795318109..9b240b08c427781145bdc66fab05fc98e6b0a9f4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6cf76c2ae25d6e58926637ecd42eed6b300b1a25
\ No newline at end of file
+97f8a886b6314b044a0522a88f569798fdfb3ef9
\ No newline at end of file

diff --git a/test/check.test b/test/check.test
index 51ab1f31bacd1cc026abe457476bf0807046444a..d2867a096ebc588dc63cba3572682e1eae658822 100644 (file)
--- a/test/check.test
+++ b/test/check.test
@@ -239,43 +239,43 @@ do_test check-4.3 {
     SELECT * FROM t4
   }
 } {4 3}
-do_test check-4.3 {
+do_test check-4.4 {
   execsql {
     UPDATE t4 SET x=12, y=2;
     SELECT * FROM t4
   }
 } {12 2}
-do_test check-4.4 {
+do_test check-4.5 {
   execsql {
     UPDATE t4 SET x=12, y=-22;
     SELECT * FROM t4
   }
 } {12 -22}
-do_test check-4.5 {
+do_test check-4.6 {
   catchsql {
     UPDATE t4 SET x=0, y=1;
   }
 } {1 {constraint failed}}
-do_test check-4.6 {
+do_test check-4.7 {
   execsql {
     SELECT * FROM t4;
   }
 } {12 -22}
-do_test check-4.7 {
+do_test check-4.8 {
   execsql {
     PRAGMA ignore_check_constraints=ON;
     UPDATE t4 SET x=0, y=1;
     SELECT * FROM t4;
   }
 } {0 1}
-do_test check-4.8 {
+do_test check-4.9 {
   catchsql {
     PRAGMA ignore_check_constraints=OFF;
     UPDATE t4 SET x=0, y=2;
   }
 } {1 {constraint failed}}
 ifcapable vacuum {
-  do_test check_4.9 {
+  do_test check_4.10 {
     catchsql {
       VACUUM
     }

diff --git a/test/fuzz2.test b/test/fuzz2.test
index eb5eb83a3ccabf748282fd4d83720f03b2979e57..989b00f056afe1bf3b5e21c0d540e62d4eaa54fd 100644 (file)
--- a/test/fuzz2.test
+++ b/test/fuzz2.test
@@ -65,6 +65,9 @@ do_test fuzz2-2.11 {
 do_test fuzz2-2.12 {
   fuzzcatch {SELECT - #196}
 } {1}
+
+ifcapable {trigger} {  # Only do the following tests if triggers are enabled
+
 do_test fuzz2-3.0 {
   fuzzcatch {CREATE TRIGGER "AAAAAA" . "AAAAAA" AFTER UPDATE OF "AAAAAA" , "AAAAAA" ON "AAAAAA" . "AAAAAA" FOR EACH ROW BEGIN UPDATE AAAAAA SET "AAAAAA" = #162;  END}
 } {1}
@@ -74,6 +77,9 @@ do_test fuzz2-3.1 {
 do_test fuzz2-3.2 {
   fuzzcatch {CREATE TEMP TRIGGER IF NOT EXISTS AAAAAA . "AAAAAA" BEFORE UPDATE OF "AAAAAA" ON AAAAAA . "AAAAAA" BEGIN SELECT ALL * , #175 "AAAAAA" FROM "AAAAAA" . AAAAAA;  END}
 } {1}
+
+} ;# End of ifcapable {trigger}
+
 do_test fuzz2-4.0 {
   fuzzcatch {ATTACH DATABASE #168 AS whatever}
 } {1}

diff --git a/test/schema.test b/test/schema.test
index eeb2102836317b60b5673da92572030d1abfb266..5e9f17573f43c99369c414e59ff2801eab01e3e0 100644 (file)
--- a/test/schema.test
+++ b/test/schema.test
@@ -364,6 +364,8 @@ do_test schema-12.1 {
   list [sqlite3_step $::STMT] [sqlite3_finalize $::STMT]
 } {SQLITE_ERROR SQLITE_SCHEMA}
 
+ifcapable {auth} {
+
 do_test schema-13.1 {
   set S [sqlite3_prepare_v2 db "SELECT * FROM sqlite_master" -1 dummy]
   db function hello hello
@@ -384,4 +386,6 @@ do_test schema-13.3 {
   sqlite3_finalize $S
 } {SQLITE_SCHEMA}
 
+}
+
 finish_test

diff --git a/test/tkt-3fe897352e.test b/test/tkt-3fe897352e.test
index eb4f178135fe2ef2056fa0b68e1a97fcf4fa7003..deafe48e0e5fb5744759c645ce25b5fb3677637e 100644 (file)
--- a/test/tkt-3fe897352e.test
+++ b/test/tkt-3fe897352e.test
@@ -16,6 +16,13 @@
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
+\r
+# The following tests use hex_to_utf16be() and hex_to_utf16le() which \r
+# which are only available if SQLite is built with UTF16 support.\r
+ifcapable {!utf16} {
+  finish_test
+  return
+}
 
 do_test tkt-3fe89-1.1 {
   db close