Merge the PAGECACHE_BLOCKALLOC changes into trunk.

FossilOrigin-Name: 768c1846d48a555054f07edeabdae8817a2c0a8e

test/ctime.test

@@ -223,5 +223,16 @@ do_test ctime-2.5.$tc {
   } ]
 } {0 {{}}}
 
+ifcapable blockalloc {
+  do_test ctime-3.1a {
+    db eval {SELECT sqlite_compileoption_used('PAGECACHE_BLOCKALLOC')}
+  } {1}
+} else {
+  do_test ctime-3.1b {
+    db eval {SELECT sqlite_compileoption_used('PAGECACHE_BLOCKALLOC')}
+  } {0}
+}
+
+
 
 finish_test

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

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

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.