Fix some test cases so that they work under the Apple configuration.

FossilOrigin-Name: 399c60764d3fdec49dab1745c30930ca1dbafe70

diff --git a/manifest b/manifest
index 9d6db86ef21a3b7e02d4f591f4d88fce5140baf8..6b11a73093858872dbc4d85dd671c88b395cb42f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings\sthat\sarise\swith\s-DSQLITE_OMIT_LOAD_EXTENSION
-D 2016-03-17T23:16:37.996
+C Fix\ssome\stest\scases\sso\sthat\sthey\swork\sunder\sthe\sApple\sconfiguration.
+D 2016-03-17T23:56:23.638
 F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@ -375,7 +375,7 @@ F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
 F src/test_bestindex.c 29af3cc3b963ffe5760c85d142b9b3e5302c1e3d
 F src/test_blob.c b2551a9b5573232db5f66f292307c37067937239
 F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
-F src/test_config.c 0dee90328e3dedf8ba002ee94b6a7e7ea7726fe4
+F src/test_config.c 57e52a768ea0dd3499164e307559d5eb96df7ee3
 F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
 F src/test_fs.c f10f840ca4f8c72e4837908bd8347ac4bcab074b
@@ -520,9 +520,9 @@ F test/busy.test 76b4887f8b9160ba903c1ac22e8ff406ad6ae2f0
 F test/cache.test 13bc046b26210471ca6f2889aceb1ea52dc717de
 F test/cacheflush.test af25bb1509df04c1da10e38d8f322d66eceedf61
 F test/capi2.test 011c16da245fdc0106a2785035de6b242c05e738
-F test/capi3.test bf6f0308bbbba1e770dac13aa08e5c2ac61c7324
+F test/capi3.test db0731f6e2a94f96c6d4c478fedef4e0c077026c
 F test/capi3b.test efb2b9cfd127efa84433cd7a2d72ce0454ae0dc4
-F test/capi3c.test 06f6261f9e9b4ef6f76afcd9900f3665408af1c8
+F test/capi3c.test b28ec47692f0fc50eb61b2d464d8d52e816b3732
 F test/capi3d.test 485048dc5cd07bc68011e4917ad035ad6047ab82
 F test/capi3e.test 3d49c01ef2a1a55f41d73cba2b23b5059ec460fe
 F test/cast.test 4c275cbdc8202d6f9c54a3596701719868ac7dc3
@@ -1304,8 +1304,8 @@ F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
 F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
 F test/vtab_shared.test 5253bff2355a9a3f014c15337da7e177ab0ef8ad
 F test/wal.test 613efec03e517e1775d86b993a54877d2e29a477
-F test/wal2.test 25ae059e900dbb584e0775627e45415ba5940df1
-F test/wal3.test 5dd734147f1f8f958c5261a1f2775d346d7013ce
+F test/wal2.test 56b0bc95b8693a0be294f8d210c49025dd094bd7
+F test/wal3.test 2a93004bc0fb2b5c29888964024695bade278ab2
 F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 F test/wal5.test 9c11da7aeccd83a46d79a556ad11a18d3cb15aa9
 F test/wal6.test a9d6aa635b9d63607dabdc11406f5f96ca986635
@@ -1456,7 +1456,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P beb2a80b430e0ad561a58d8f00b80cbdc74b5e03
-R 37561b4e78990edaf3c970fae7bb038b
+P 65ba2f0b465a1493de6e467f55e0300ac3fb08e1
+R 7cf410a0d799b5e757a3a8b96ff17372
 U drh
-Z cf3b29714b0e10f6a050d8250c16f911
+Z 802d45975b74ad53aebc4d60c61be48a

diff --git a/manifest.uuid b/manifest.uuid
index 5f8e183ba79d95f0ea376a69adf40a6606254b26..b971b998c3c3865f50a90f14963a74b41b55f847 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-65ba2f0b465a1493de6e467f55e0300ac3fb08e1
\ No newline at end of file
+399c60764d3fdec49dab1745c30930ca1dbafe70
\ No newline at end of file

diff --git a/src/test_config.c b/src/test_config.c
index 30b421e00b693566d26a09c18afa0ba9ae970051..cc6243e44f3195a9c6c474d0b6022c4ca0be388a 100644 (file)
--- a/src/test_config.c
+++ b/src/test_config.c
@@ -79,6 +79,13 @@ static void set_options(Tcl_Interp *interp){
   Tcl_SetVar2(interp, "sqlite_options", "debug", "0", TCL_GLOBAL_ONLY);
 #endif
 
+#ifdef SQLITE_DEFAULT_CKPTFULLFSYNC
+  Tcl_SetVar2(interp, "sqlite_options", "default_ckptfullfsync", 
+              SQLITE_DEFAULT_CKPTFULLFSYNC ? "1" : "0", TCL_GLOBAL_ONLY);
+#else
+  Tcl_SetVar2(interp, "sqlite_options", "default_ckptfullfsync", "0", TCL_GLOBAL_ONLY);
+#endif
+
 #ifdef SQLITE_DIRECT_OVERFLOW_READ
   Tcl_SetVar2(interp, "sqlite_options", "direct_read", "1", TCL_GLOBAL_ONLY);
 #else

diff --git a/test/capi3.test b/test/capi3.test
index 163bb19ada472e0bdf9a5393154eaa2ed4015487..684872bc6be1da6d36b05822e36c88e58192e31a 100644 (file)
--- a/test/capi3.test
+++ b/test/capi3.test
@@ -925,19 +925,20 @@ do_test capi3-11.9.3 {
 do_test capi3-11.10 {
   sqlite3_step $STMT
 } {SQLITE_ROW}
-ifcapable !autoreset {
-  # If SQLITE_OMIT_AUTORESET is defined, then the statement must be
-  # reset() before it can be passed to step() again.
-  do_test capi3-11.11a { sqlite3_step $STMT } {SQLITE_MISUSE}
-  do_test capi3-11.11b { sqlite3_reset $STMT } {SQLITE_ABORT}
-}
 do_test capi3-11.11 {
   sqlite3_step $STMT
 } {SQLITE_DONE}
-do_test capi3-11.12 {
-  sqlite3_step $STMT
-  sqlite3_step $STMT
-} {SQLITE_ROW}
+ifcapable api_armor {
+  do_test capi3-11.12armor {
+    sqlite3_step $STMT
+    sqlite3_step $STMT
+  } {SQLITE_MISUSE}
+} else {
+  do_test capi3-11.12 {
+    sqlite3_step $STMT
+    sqlite3_step $STMT
+  } {SQLITE_ROW}
+}
 do_test capi3-11.13 {
   sqlite3_finalize $STMT
 } {SQLITE_OK}

diff --git a/test/capi3c.test b/test/capi3c.test
index 15307a7f7ac90bc4fe5d92375b3788c2a21fb870..91c02561b1a40f049b9b31804ea29e65be7f11dc 100644 (file)
--- a/test/capi3c.test
+++ b/test/capi3c.test
@@ -865,19 +865,20 @@ do_test capi3c-11.9.3 {
 do_test capi3c-11.10 {
   sqlite3_step $STMT
 } {SQLITE_ROW}
-ifcapable !autoreset {
-  # If SQLITE_OMIT_AUTORESET is defined, then the statement must be
-  # reset() before it can be passed to step() again.
-  do_test capi3-11.11a { sqlite3_step $STMT } {SQLITE_MISUSE}
-  do_test capi3-11.11b { sqlite3_reset $STMT } {SQLITE_ABORT}
-}
 do_test capi3c-11.11 {
   sqlite3_step $STMT
 } {SQLITE_DONE}
-do_test capi3c-11.12 {
-  sqlite3_step $STMT
-  sqlite3_step $STMT
-} {SQLITE_ROW}
+ifcapable api_armor {
+  do_test capi3c-11.12armor {
+    sqlite3_step $STMT
+    sqlite3_step $STMT
+  } {SQLITE_MISUSE}
+} else {
+  do_test capi3c-11.12 {
+    sqlite3_step $STMT
+    sqlite3_step $STMT
+  } {SQLITE_ROW}
+}
 do_test capi3c-11.13 {
   sqlite3_finalize $STMT
 } {SQLITE_OK}

diff --git a/test/wal2.test b/test/wal2.test
index 4b9bbf315f17847e6768e16782557a1c947eb902..0b15b1546170beb339ab3d101553d9637ef5ad8f 100644 (file)
--- a/test/wal2.test
+++ b/test/wal2.test
@@ -1194,6 +1194,9 @@ foreach {tn sql reslist} {
   2 { PRAGMA checkpoint_fullfsync = 1 } {10 4 4 2 6 2}
   3 { PRAGMA checkpoint_fullfsync = 0 } {10 0 4 0 6 0}
 } {
+  ifcapable default_ckptfullfsync {
+    if {[string trim $sql]==""} continue
+  }
   faultsim_delete_and_reopen
 
   execsql {PRAGMA auto_vacuum = 0; PRAGMA synchronous = FULL;}

diff --git a/test/wal3.test b/test/wal3.test
index da3d31877395fb1546bac9e74fa2d43b01aa94ec..56f40ab539193ecc0f332fbb5e67c5a0e7db0028 100644 (file)
--- a/test/wal3.test
+++ b/test/wal3.test
@@ -220,6 +220,7 @@ foreach {tn syncmode synccount} {
     sqlite3 db test.db -vfs T
   
     execsql "PRAGMA synchronous = $syncmode"
+    execsql "PRAGMA checkpoint_fullfsync = 0"
     execsql { PRAGMA journal_mode = WAL }
     execsql { CREATE TABLE filler(a,b,c); }