Fix more test-case errors in the Apple configuration.

FossilOrigin-Name: 6631e1e655604a7d1fb45b4d151938d4a13b47f3

diff --git a/manifest b/manifest
index 6b11a73093858872dbc4d85dd671c88b395cb42f..4447b9560340e660143277a67648ac7c468b9d23 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\ssome\stest\scases\sso\sthat\sthey\swork\sunder\sthe\sApple\sconfiguration.
-D 2016-03-17T23:56:23.638
+C Fix\smore\stest-case\serrors\sin\sthe\sApple\sconfiguration.
+D 2016-03-18T00:19:48.288
 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 57e52a768ea0dd3499164e307559d5eb96df7ee3
+F src/test_config.c 0fb2571777ef43a8442be4f9c62a25f530872328
 F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
 F src/test_fs.c f10f840ca4f8c72e4837908bd8347ac4bcab074b
@@ -889,7 +889,7 @@ F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e
 F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
 F test/memdb.test c1f2a343ad14398d5d6debda6ea33e80d0dafcc7
 F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
-F test/memsubsys1.test 0311bfb4edd2615e3aa56c7a9cf44574e4229077
+F test/memsubsys1.test 69924593856040e266fdd9aa1ecb4d5a0888eb12
 F test/memsubsys2.test 3e4a8d0c05fd3e5fa92017c64666730a520c7e08
 F test/minmax.test 42fbad0e81afaa6e0de41c960329f2b2c3526efd
 F test/minmax2.test b44bae787fc7b227597b01b0ca5575c7cb54d3bc
@@ -913,7 +913,7 @@ F test/multiplex.test efd015ca0b5b4a57dc9535b8feb1273eebeadb60
 F test/multiplex2.test 580ca5817c7edbe4cc68fa150609c9473393003a
 F test/multiplex3.test d228f59eac91839a977eac19f21d053f03e4d101
 F test/multiplex4.test e8ae4c4bd70606a5727743241f13b5701990abe4
-F test/mutex1.test e0a44072d98189003deae4b091106f085d94bea8
+F test/mutex1.test ea2cc74d97f077b9e74c84cbd024f14d79a8126f
 F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660
 F test/nan.test dacc57f80859c06a433d30839336fe227d2038b3
 F test/nolock.test 96e922d2d3db71c2dd6557c98e8027a28277b415
@@ -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 65ba2f0b465a1493de6e467f55e0300ac3fb08e1
-R 7cf410a0d799b5e757a3a8b96ff17372
+P 399c60764d3fdec49dab1745c30930ca1dbafe70
+R 6d659b59f432dac31e8bf0c8b3f7d1b0
 U drh
-Z 802d45975b74ad53aebc4d60c61be48a
+Z 34dc8dd8397892469013fc1a83c5fbd6

diff --git a/manifest.uuid b/manifest.uuid
index b971b998c3c3865f50a90f14963a74b41b55f847..03b3a4a5c680d35276d23ce21c21480882832fff 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-399c60764d3fdec49dab1745c30930ca1dbafe70
\ No newline at end of file
+6631e1e655604a7d1fb45b4d151938d4a13b47f3
\ No newline at end of file

diff --git a/src/test_config.c b/src/test_config.c
index cc6243e44f3195a9c6c474d0b6022c4ca0be388a..7a51accc6f4ab40dafef56f0a229a41a441afd58 100644 (file)
--- a/src/test_config.c
+++ b/src/test_config.c
@@ -104,6 +104,12 @@ static void set_options(Tcl_Interp *interp){
   Tcl_SetVar2(interp, "sqlite_options", "lfs", "1", TCL_GLOBAL_ONLY);
 #endif
 
+#ifdef SQLITE_DISABLE_PAGECACHE_OVERFLOW_STATS
+  Tcl_SetVar2(interp, "sqlite_options", "pagecache_overflow_stats","0",TCL_GLOBAL_ONLY);
+#else
+  Tcl_SetVar2(interp, "sqlite_options", "pagecache_overflow_stats","1",TCL_GLOBAL_ONLY);
+#endif
+
 #if SQLITE_MAX_MMAP_SIZE>0
   Tcl_SetVar2(interp, "sqlite_options", "mmap", "1", TCL_GLOBAL_ONLY);
 #else
@@ -583,7 +589,11 @@ Tcl_SetVar2(interp, "sqlite_options", "mergesort", "1", TCL_GLOBAL_ONLY);
 #endif
 
   Tcl_SetVar2(interp, "sqlite_options", "threadsafe", 
-      STRINGVALUE(SQLITE_THREADSAFE), TCL_GLOBAL_ONLY);
+      SQLITE_THREADSAFE ? "1" : "0", TCL_GLOBAL_ONLY);
+  Tcl_SetVar2(interp, "sqlite_options", "threadsafe1", 
+      SQLITE_THREADSAFE==1 ? "1" : "0", TCL_GLOBAL_ONLY);
+  Tcl_SetVar2(interp, "sqlite_options", "threadsafe2", 
+      SQLITE_THREADSAFE==2 ? "1" : "0", TCL_GLOBAL_ONLY);
   assert( sqlite3_threadsafe()==SQLITE_THREADSAFE );
 
 #ifdef SQLITE_OMIT_TEMPDB

diff --git a/test/memsubsys1.test b/test/memsubsys1.test
index e9a4cf08a85d29acb3ee796d3cc2d2319774618e..f0b060fc9f9dbca0eb52bb18b71e93282ffc5c09 100644 (file)
--- a/test/memsubsys1.test
+++ b/test/memsubsys1.test
@@ -100,10 +100,12 @@ reset_highwater_marks
 build_test_db memsubsys1-2 {PRAGMA page_size=1024; PRAGMA mmap_size=0}
 #show_memstats
 set MEMORY_MANAGEMENT $sqlite_options(memorymanage)
-ifcapable !malloc_usable_size {
- do_test memsubsys1-2.3 {
-    set pg_ovfl [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_OVERFLOW 0] 2]
-  } [expr ($TEMP_STORE>1 || $MEMORY_MANAGEMENT==0)*1024]
+ifcapable pagecache_overflow_stats {
+  ifcapable !malloc_usable_size {
+    do_test memsubsys1-2.3 {
+      set pg_ovfl [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_OVERFLOW 0] 2]
+    } [expr ($TEMP_STORE>1 || $MEMORY_MANAGEMENT==0)*1024]
+  }
 }
 do_test memsubsys1-2.4 {
   set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]

diff --git a/test/mutex1.test b/test/mutex1.test
index 340e2711753732636c8358c06708d5bc2230d960..f567a0d930d5235bdb6138161a7e981473920fa4 100644 (file)
--- a/test/mutex1.test
+++ b/test/mutex1.test
@@ -97,7 +97,7 @@ do_test mutex1-1.9 {
 #   * Multi-threaded mode,
 #   * Single-threaded mode.
 #
-ifcapable threadsafe&&shared_cache {
+ifcapable threadsafe1&&shared_cache {
   set enable_shared_cache [sqlite3_enable_shared_cache 1]
   foreach {mode mutexes} {
     singlethread {}