Modify test cases so that veryquick.test passes with PAGECACHE_BLOCKALLOC defined.

FossilOrigin-Name: c61000705b61dc448a838846826d1a5ab5eaca2b

diff --git a/manifest b/manifest
index 54adbea9e69613079ee29646a1181dfb37366065..a0faac1aba327cf31f1d0560ab5e2d1e92c9d8e3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Experimental\schange:\sIf\sSQLITE_PAGECACHE_BLOCKALLOC\sis\sdefined,\sinstead\sof\sallocating\spages\sone\sat\sa\stime,\sallocate\sblocks\sof\sbetween\s15\sand\s63\spages\sin\sa\ssingle\sallocation.
-D 2011-08-19T18:15:00.523
+C Modify\stest\scases\sso\sthat\sveryquick.test\spasses\swith\sPAGECACHE_BLOCKALLOC\sdefined.
+D 2011-08-22T14:55:54
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8c930e7b493d59099ea1304bd0f2aed152eb3315
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -201,7 +201,7 @@ F src/test_async.c 0612a752896fad42d55c3999a5122af10dcf22ad
 F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
 F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
 F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2
-F src/test_config.c 9bc44df77f22cd0648c651fcd459353b8a984d7b
+F src/test_config.c e342660556d64365aacea2b23cbb5e6654d7278f
 F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
 F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5
@@ -583,9 +583,9 @@ F test/mallocK.test d79968641d1b70d88f6c01bdb9a7eb4a55582cc9
 F test/malloc_common.tcl 2930895b0962823ec679853e67e58dd6d8198b3c
 F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e
 F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
-F test/memdb.test 708a028d6d373e5b3842e4bdc8ba80998c9a4da6
+F test/memdb.test 4b5d2671588ed59cb08642adc67fd78c666dc9c2
 F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
-F test/memsubsys1.test 16ce163ac1ace3d71bf0eaa6a821ed153addd91f
+F test/memsubsys1.test 39f1ddddf76ce51a3232aab0279668e23cf00f83
 F test/memsubsys2.test 3a1c1a9de48e5726faa85108b02459fae8cb9ee9
 F test/minmax.test 722d80816f7e096bf2c04f4111f1a6c1ba65453d
 F test/minmax2.test 33504c01a03bd99226144e4b03f7631a274d66e0
@@ -618,7 +618,7 @@ F test/pagerfault3.test f16e2efcb5fc9996d1356f7cbc44c998318ae1d7
 F test/pageropt.test 8146bf448cf09e87bb1867c2217b921fb5857806
 F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
 F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
-F test/pcache2.test 9f9357bb0f463b87bdf695646024ed2031a0c85a
+F test/pcache2.test bc67c6802989dba05cdf3a4574fd882e238c7ecf
 F test/permutations.test ad17319066a90e2db71823c3ff104795ffc71b31
 F test/pragma.test c8108e01da04f16e67e5754e610bc62c1b993f6c
 F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
@@ -960,10 +960,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
-P 21452f3ae6b5882b03c7cc41e661c7b8144cc3df
-R 2997be16a993dfce2f800d3578e57dd4
-T *branch * pager-blockalloc
-T *sym-pager-blockalloc *
-T -sym-trunk *
+P 63597097eedf80080fab0c1978cfd66ecaaa79fa
+R 397f8ab116cb0f87f68b6bf88cbdf035
 U dan
-Z 1efe07fa4b86c6fc00527f5dc4f02f5a
+Z 6577dc2ab7dde3596c443709ef216908

diff --git a/manifest.uuid b/manifest.uuid
index 6588cb9e67131223e94b69fed13ef43931fca255..48e2a7962e537942a4ac40762752e3905a0680ca 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-63597097eedf80080fab0c1978cfd66ecaaa79fa
\ No newline at end of file
+c61000705b61dc448a838846826d1a5ab5eaca2b
\ No newline at end of file

diff --git a/src/test_config.c b/src/test_config.c
index 5b0ffaa697d65884500b2f262d5f2564d7e1e38e..5af60bafd065608e8979441e55a822e9d666afae 100644 (file)
--- 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
index 1da3d7c58b43b05639fae630b6d123ef925b1967..ec3accffa646c1fc6f17829fe0587ebc47fc6fb0 100644 (file)
--- 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
index 7eecf083a77da3e190dbc2b7198ad2335779d213..dbd4f233ec0265fcfbe7dcd191df04fddaeb8cd6 100644 (file)
--- 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
index 20cb2a846611caafb5c12714b5563047dd1dcd10..bbfb90d29cc2b10f95b856b5aca8f4ff03ce40f1 100644 (file)
--- 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.