Make sure SQLite is running with MEMSTATUS enabled at the beginning of

every test script.

FossilOrigin-Name: 699953140511c14cbba499fad086187977476660

diff --git a/manifest b/manifest
index d61a336e000728198c6146d26a3d1a9713c200b2..660e5860bcd785787ed54f22291de1bee687ec1b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Make\ssure\sMEMSTATUS\sis\senabled\sat\sthe\sbeginning\sof\sthe\smemsubsys2.test\sscript.
-D 2010-09-09T23:42:34
+C Make\ssure\sSQLite\sis\srunning\swith\sMEMSTATUS\senabled\sat\sthe\sbeginning\sof\nevery\stest\sscript.
+D 2010-09-10T13:23:00
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -530,7 +530,7 @@ F test/manydb.test b3d3bc4c25657e7f68d157f031eb4db7b3df0d3c
 F test/memdb.test 0825155b2290e900264daaaf0334b6dfe69ea498
 F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
 F test/memsubsys1.test ef3d2af85bd55b8136e7fffd3b66e38e7864f32c
-F test/memsubsys2.test ddbd4af61d17f065726afe6e63d48fdcdb347e4b
+F test/memsubsys2.test 72a731225997ad5e8df89fdbeae9224616b6aecc
 F test/minmax.test 722d80816f7e096bf2c04f4111f1a6c1ba65453d
 F test/minmax2.test 33504c01a03bd99226144e4b03f7631a274d66e0
 F test/minmax3.test 66a60eb0f20281b0753249d347c5de0766954cee
@@ -636,7 +636,7 @@ F test/tclsqlite.test 8c154101e704170c2be10f137a5499ac2c6da8d3
 F test/tempdb.test 800c36623d67a2ad1f58784b9c5644e0405af6e6
 F test/temptable.test f42121a0d29a62f00f93274464164177ab1cc24a
 F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05
-F test/tester.tcl 6135019fcfac363ea0e11aee670cc97080ab578e
+F test/tester.tcl d2f1bf08719de0d40bde73096c55a03d0a7de503
 F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f
 F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db
 F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca
@@ -860,14 +860,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 5e73f7b2b77ba5e0670c512d9ef9eeb9bb654c27
-R ce59a8727c15300fe585e49c2d400cb8
+P c23b97219df43a870c6cb2aac84e54aaa5db4f3a
+R 690b86651016964cb6c585f5663514da
 U drh
-Z 8961c7425f25e5ba1cbc8d8f43511469
+Z af87d1a482e7680c020abb1599e233d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMiXDtoxKgR168RlERAmZTAJ9xWvXRhROSyOUjcVn0T4lcDN9SgACfY7d+
-MqpCsHk3ZTA7wAu9nuduKsI=
-=TdxW
+iD8DBQFMijNvoxKgR168RlERAiJPAJ9vKY/leUtbcNkIXYMghZ/BlKvPcACfbHML
+M80lH+VrkbAsjRlvmGuGhCE=
+=6NrJ
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 7a2075e74f0d22726f77b9aeac43fd8f0ab9d7d5..c4b5992fced5b7118136849d6732c3817e9723e9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c23b97219df43a870c6cb2aac84e54aaa5db4f3a
\ No newline at end of file
+699953140511c14cbba499fad086187977476660
\ No newline at end of file

diff --git a/test/memsubsys2.test b/test/memsubsys2.test
index 8728248338861f2986a2e44e370aef1774e56a59..ec554775d256763bd2fe256e0852c019cf44f9b5 100644 (file)
--- a/test/memsubsys2.test
+++ b/test/memsubsys2.test
@@ -16,9 +16,6 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 sqlite3_reset_auto_extension
-sqlite3_shutdown
-sqlite3_config_memstatus 1
-sqlite3_initialize
 
 # This procedure constructs a new database in test.db.  It fills
 # this database with many small records (enough to force multiple

diff --git a/test/tester.tcl b/test/tester.tcl
index fb26561b231f92eccbef7040b872da7a2b96f40e..f1703425baea6968e657a2d1324cc4408be6c9c3 100644 (file)
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -245,6 +245,10 @@ reset_db
 #
 if {[info exists TC(count)]} return
 
+# Make sure memory statistics are enabled.
+#
+sqlite3_config_memstatus 1
+
 # Initialize the test counters and set up commands to access them.
 # Or, if this is a slave interpreter, set up aliases to write the
 # counters in the parent interpreter.