Disable the DBSTATUS_CACHE_USED_SHARED tests on mac when memsys3/5 is disabled

due to differences in the allocation sizes for the Darwin memory allocator.

FossilOrigin-Name: d6f6c87c9c0acf609a9d5bea818bb7a5437109a1

diff --git a/manifest b/manifest
index 9cd5c96943b2395a53d2f9211200f696316ff21b..7e15c062ffc200ab5c0207dd5b9f1223ce1e108c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\svacuummem.test\sscript\sso\sthat\sit\sworks\son\smac\sas\swell\sas\son\slinux.
-D 2016-07-25T12:01:18.862
+C Disable\sthe\sDBSTATUS_CACHE_USED_SHARED\stests\son\smac\swhen\smemsys3/5\sis\sdisabled\ndue\sto\sdifferences\sin\sthe\sallocation\ssizes\sfor\sthe\sDarwin\smemory\sallocator.
+D 2016-07-25T12:10:25.504
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -621,7 +621,7 @@ F test/ctime.test 0b995accd44a52914bd4744d5c1b6e1a56c7897c
 F test/cursorhint.test 7bc346788390475e77a345da2b92270d04d35856
 F test/cursorhint2.test 2b45341d32d1aae9991a00ef31ebca339b274255
 F test/date.test 984ac1e3e5e031386866f034006148d3972b4a65
-F test/dbstatus.test 2bb4d576f11c0f57f5633dad373ad1a57c2a7195
+F test/dbstatus.test 58b31ba1dee1a6524189666c5882ab145d1f229b
 F test/dbstatus2.test e93ab03bfae6d62d4d935f20de928c19ca0ed0ab
 F test/default.test 0cb49b1c315a0d81c81d775e407f66906a2a604d
 F test/delete.test e1bcdf8926234e27aac24b346ad83d3329ec8b6f
@@ -1507,7 +1507,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 ccc22e14dc5d910d632807f49484be54dc2fde83
-R f8760ea1979a3d1e72e54c3ea906ea99
+P ea7fb98b96f13f7dc5ed83ec5e8ad8857e20e06e
+R 3485ec1f1845ad365519b5b860f50dc5
 U drh
-Z 5b9cf50a9e82d7593d62c569e8fac940
+Z 3712e6b13d05abd58f12d65f644b4035

diff --git a/manifest.uuid b/manifest.uuid
index 9f906f5e5e0cf1138dd26bb3f2f69f4568e8bd60..1d8d5dc41a14e9a67417aed7500bb7bd6c9602c0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ea7fb98b96f13f7dc5ed83ec5e8ad8857e20e06e
\ No newline at end of file
+d6f6c87c9c0acf609a9d5bea818bb7a5437109a1
\ No newline at end of file

diff --git a/test/dbstatus.test b/test/dbstatus.test
index fb4cbe04ba464d32f80fc222090b58ea5d9c8317..a3518e9b6f7b75353e3e641ac97c54bc5f4bda7a 100644 (file)
--- a/test/dbstatus.test
+++ b/test/dbstatus.test
@@ -379,36 +379,40 @@ foreach ::lookaside_buffer_size {0 64 120} {
 # The following tests focus on DBSTATUS_CACHE_USED_SHARED
 #
 ifcapable shared_cache {
-  proc do_cacheused_test {tn db res} {
-    set cu [sqlite3_db_status $db SQLITE_DBSTATUS_CACHE_USED 0]
-    set pcu [sqlite3_db_status $db SQLITE_DBSTATUS_CACHE_USED_SHARED 0]
-    set cu [lindex $cu 1]
-    set pcu [lindex $pcu 1]
-    uplevel [list do_test $tn [list list $cu $pcu] "#/$res/"]
-  }
-  reset_db
-  sqlite3 db file:test.db?cache=shared
-
-  do_execsql_test 4.0 {
-    PRAGMA auto_vacuum=NONE;
-    CREATE TABLE t1(a, b, c);
-    INSERT INTO t1 VALUES(1, 2, 3);
-  }
-  do_cacheused_test 4.0.1 db { 4568 4568 }
-  do_execsql_test 4.1 {
-    CREATE TEMP TABLE tt(a, b, c);
-    INSERT INTO tt VALUES(1, 2, 3);
+  if {[permutation]=="memsys3"
+      || [permutation]=="memsys5"
+      || $::tcl_platform(os)!="Darwin"} {
+    proc do_cacheused_test {tn db res} {
+      set cu [sqlite3_db_status $db SQLITE_DBSTATUS_CACHE_USED 0]
+      set pcu [sqlite3_db_status $db SQLITE_DBSTATUS_CACHE_USED_SHARED 0]
+      set cu [lindex $cu 1]
+      set pcu [lindex $pcu 1]
+      uplevel [list do_test $tn [list list $cu $pcu] "#/$res/"]
+    }
+    reset_db
+    sqlite3 db file:test.db?cache=shared
+  
+    do_execsql_test 4.0 {
+      PRAGMA auto_vacuum=NONE;
+      CREATE TABLE t1(a, b, c);
+      INSERT INTO t1 VALUES(1, 2, 3);
+    }
+    do_cacheused_test 4.0.1 db { 4568 4568 }
+    do_execsql_test 4.1 {
+      CREATE TEMP TABLE tt(a, b, c);
+      INSERT INTO tt VALUES(1, 2, 3);
+    }
+    do_cacheused_test 4.1.1 db { 9000 9000 }
+  
+    sqlite3 db2 file:test.db?cache=shared
+    do_cacheused_test 4.2.1 db2 { 4568 2284 }
+    do_cacheused_test 4.2.2 db { 9000 6716 }
+    db close
+    do_cacheused_test 4.2.3 db2 { 4568 4568 }
+    sqlite3 db file:test.db?cache=shared
+    do_cacheused_test 4.2.4 db2 { 4568 2284 }
+    db2 close
   }
-  do_cacheused_test 4.1.1 db { 9000 9000 }
-
-  sqlite3 db2 file:test.db?cache=shared
-  do_cacheused_test 4.2.1 db2 { 4568 2284 }
-  do_cacheused_test 4.2.2 db { 9000 6716 }
-  db close
-  do_cacheused_test 4.2.3 db2 { 4568 4568 }
-  sqlite3 db file:test.db?cache=shared
-  do_cacheused_test 4.2.4 db2 { 4568 2284 }
-  db2 close
 }
 
 finish_test