Modify test cases so that veryquick.test passes with PAGECACHE_BLOCKA…

…LLOC defined.
alpinejoe · Aug 22, 2011 · b1c3ba1 · b1c3ba1
1 parent f5deb31
commit b1c3ba1
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/src/test_config.c b/src/test_config.c
@@ -555,6 +555,12 @@ Tcl_SetVar2(interp, "sqlite_options", "long_double",
   Tcl_SetVar2(interp, "sqlite_options", "yytrackmaxstackdepth", "0", TCL_GLOBAL_ONLY);
 #endif
 
+#ifdef SQLITE_PAGECACHE_BLOCKALLOC
+  Tcl_SetVar2(interp, "sqlite_options", "blockalloc", "1", TCL_GLOBAL_ONLY);
+#else
+  Tcl_SetVar2(interp, "sqlite_options", "blockalloc", "0", TCL_GLOBAL_ONLY);
+#endif
+
 #define LINKVAR(x) { \
     static const int cv_ ## x = SQLITE_ ## x; \
     Tcl_LinkVar(interp, "SQLITE_" #x, (char *)&(cv_ ## x), \

diff --git a/test/memdb.test b/test/memdb.test
@@ -407,7 +407,7 @@ do_test memdb-8.2 {
 
 # Test that auto-vacuum works with in-memory databases.
 # 
-ifcapable autovacuum {
+ifcapable autovacuum&&!blockalloc {
   do_test memdb-9.1 {
     db close
     sqlite3 db test.db

diff --git a/test/memsubsys1.test b/test/memsubsys1.test
@@ -25,6 +25,13 @@ if {[permutation] == "memsubsys1"} {
   return
 }
 
+# Nor will it work if the pager is allocating memory in blocks.
+#
+ifcapable blockalloc {
+  finish_test
+  return
+}
+
 # This procedure constructs a new database in test.db.  It fills
 # this database with many small records (enough to force multiple
 # rebalance operations in the btree-layer and to require a large

diff --git a/test/pcache2.test b/test/pcache2.test
@@ -16,6 +16,13 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+# If compiled with blockalloc, pagecache memory is not used. Which
+# causes these tests to fail.
+#
+ifcapable blockalloc {
+  finish_test
+  return
+}
 
 # Set up a pcache memory pool so that we can easily track how many
 # pages are being used for cache.