Do not run the memsubsys1.test script under the memsubsys1 permutation.

FossilOrigin-Name: 3a1a8c77a5c7b57755f18d84234faed1f16c2103

diff --git a/manifest b/manifest
index 93d1fe804dae9e1775992142511e72480fe1befd..8376e4a7faf430531d61d326d71c338b1202c37f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Remove\sthe\sunused\sxRename()\smethod\sfrom\sthe\ssqlite3_vfs\sobject.\nAdd\sbetter\sdocumentation\son\sthe\sxCurrentTimeInt64()\smethod.
-D 2010-07-03T17:13:32
+C Do\snot\srun\sthe\smemsubsys1.test\sscript\sunder\sthe\smemsubsys1\spermutation.
+D 2010-07-03T19:08:19
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -516,7 +513,7 @@ F test/malloc_common.tcl d5cf479545104c0aa2e60a3a94802e128a57ebb7
 F test/manydb.test b3d3bc4c25657e7f68d157f031eb4db7b3df0d3c
 F test/memdb.test 0825155b2290e900264daaaf0334b6dfe69ea498
 F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
-F test/memsubsys1.test fd8a33046b6e758e3eb93747dc4eec21fe56bf64
+F test/memsubsys1.test 8fb47b7e2523f94c100f5885c5697505524de4b9
 F test/memsubsys2.test 72a731225997ad5e8df89fdbeae9224616b6aecc
 F test/minmax.test 722d80816f7e096bf2c04f4111f1a6c1ba65453d
 F test/minmax2.test 33504c01a03bd99226144e4b03f7631a274d66e0
@@ -833,14 +830,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 50f2f7dfd64f610982525fd7a0dd7c1ade67bebb
-R 477818314ab9a6d00010b5c5e4489546
-U drh
-Z cab31017dffc51bf4ac4822d04e694ee
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFML2+/oxKgR168RlERArECAJ4of40v91fn+xAS8loTcFI9dK2gmwCeO1af
-zthyzL3fn2DSmXLpH61iQHM=
-=pc51
------END PGP SIGNATURE-----
+P 51ec0e5432dd6849b83a3d969a018482eb3bb083
+R 0d4987db4075afdd0ccada0e82664783
+U dan
+Z c188f3bded8cfb5c3073565799273dd8

diff --git a/manifest.uuid b/manifest.uuid
index 908b45649568f75222ac389b17e07957aa92eba2..8898ab3078e89064aa056368a6643884fa05062f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-51ec0e5432dd6849b83a3d969a018482eb3bb083
\ No newline at end of file
+3a1a8c77a5c7b57755f18d84234faed1f16c2103
\ No newline at end of file

diff --git a/test/memsubsys1.test b/test/memsubsys1.test
index 8524fdeb9b39ee33ab352b0663e485c16f66ea95..918b2864157156d668a1174bf25048152560dff4 100644 (file)
--- a/test/memsubsys1.test
+++ b/test/memsubsys1.test
@@ -17,6 +17,15 @@ set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 sqlite3_reset_auto_extension
 
+# This test assumes that no page-cache or scratch buffers are installed
+# by default when a new database connection is opened. As a result, it
+# will not work with the "memsubsys1" permutation.
+#
+if {[permutation] == "memsubsys1"} {
+  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