Fix two problems in test instrumentation that show up on some fulltests. (CVS 6151)

FossilOrigin-Name: c917961743e9ab60a096801c8910c6cd8367ee2f

diff --git a/manifest b/manifest
index d8506fa8d5b31f4e5349a7af19893a6cb9f4aef5..a49e750d21fe77bd439d3f9b942df44ffc8e0b1a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Simplifications\sto\sbtree.c\sto\simprove\stest\scoverage.\s(CVS\s6150)
-D 2009-01-09T14:11:05
+C Fix\stwo\sproblems\sin\stest\sinstrumentation\sthat\sshow\sup\son\ssome\sfulltests.\s(CVS\s6151)
+D 2009-01-09T14:29:35
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 05461a9b5803d5ad10c79f989801e9fd2cc3e592
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -452,7 +452,7 @@ F test/mallocJ.test b5d1839da331d96223e5f458856f8ffe1366f62e
 F test/mallocK.test d79968641d1b70d88f6c01bdb9a7eb4a55582cc9
 F test/malloc_common.tcl 984baeb6c6b185e798827d1187d426acc2bc4962
 F test/manydb.test b3d3bc4c25657e7f68d157f031eb4db7b3df0d3c
-F test/memdb.test a67c85a29d3187ac81d3628fcf9417d8a1be9ecb
+F test/memdb.test 97d59567b282f0807a25eba8df34743476bf9ca8
 F test/memleak.test d2d2a1ff7105d32dc3fdf691458cf6cba58c7217
 F test/memsubsys1.test bdc24a38d198679d777ca4efcc089fd3948567a6
 F test/memsubsys2.test 72a731225997ad5e8df89fdbeae9224616b6aecc
@@ -467,7 +467,7 @@ F test/misc5.test 6a5c1e3217a95b0db05ff9a0f1ecb5ce9043ffef
 F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
 F test/misc7.test edbbe77d48c7d70a60f8c33e2c7d182ca25f0181
 F test/misuse.test 30b3a458e5a70c31e74c291937b6c82204c59f33
-F test/mutex1.test 820bf4a91af8cf3c9aa63c261d6c65e07b3705b9
+F test/mutex1.test 1e5c196d5170bbe3a7d8370b1b905e8c86a9e07c
 F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660
 F test/nan.test c627d79b3d36ea892563fd67584b3e8a18f0618a
 F test/notnull.test 44d600f916b770def8b095a9962dbe3be5a70d82
@@ -696,7 +696,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 6a64109d1f9b63ac8b29ea2c77da02506387b4a1
-R 01206d8a8f877e5e5315544fd44e2646
+P ac84f106d572e881136adc3434d00d70564f57cb
+R e68b60e2bd431620406ab7481f1836d4
 U drh
-Z c33d0f1e685ef44c9631dd110d7b6903
+Z 9f3b3855ff861aed9d86e2ee69b440b9

diff --git a/manifest.uuid b/manifest.uuid
index 7bb1b8bc23f14908b7c3629859e980b0e2d6d86e..809bbca82768b337e979527cdcad33374fa705e4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ac84f106d572e881136adc3434d00d70564f57cb
\ No newline at end of file
+c917961743e9ab60a096801c8910c6cd8367ee2f
\ No newline at end of file

diff --git a/test/memdb.test b/test/memdb.test
index deb8418afa855871519a7efe8ee565ebea24a4a9..7a26981109264009f794c38f7559dbd35d7d15f2 100644 (file)
--- a/test/memdb.test
+++ b/test/memdb.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is in-memory database backend.
 #
-# $Id: memdb.test,v 1.16 2009/01/07 15:18:21 danielk1977 Exp $
+# $Id: memdb.test,v 1.17 2009/01/09 14:29:35 drh Exp $
 
 
 set testdir [file dirname $argv0]
@@ -425,9 +425,10 @@ do_test memdb-9.1 {
     INSERT INTO t1 VALUES(randstr(1000,1000));
   }
   set memused [lindex [sqlite3_status SQLITE_STATUS_MEMORY_USED 0] 1]
+  set pgovfl [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_OVERFLOW 0] 1]
   execsql { DELETE FROM t1 }
   set memused2 [lindex [sqlite3_status SQLITE_STATUS_MEMORY_USED 0] 1]
-  expr {$memused2 + 2048 < $memused}
+  expr {($memused2 + 2048 < $memused) || $pgovfl==0}
 } {1}
 
 

diff --git a/test/mutex1.test b/test/mutex1.test
index 92a5c007f5480441d3d9c5165eead4b4164cb6a5..9e9da355b6fa2c94c8eebc328a5fc5555e5ab425 100644 (file)
--- a/test/mutex1.test
+++ b/test/mutex1.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: mutex1.test,v 1.16 2008/11/04 14:55:47 danielk1977 Exp $
+# $Id: mutex1.test,v 1.17 2009/01/09 14:29:35 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -24,6 +24,7 @@ if {[info exists tester_do_binarylog]} {
 }
 
 sqlite3_reset_auto_extension
+clear_mutex_counters
 
 proc mutex_counters {varname} {
   upvar $varname var