Update the memsubsys1 test script to take into account the buffer size

changes of the previous check-in. (CVS 5513)

FossilOrigin-Name: d43ff7bb8fc59c54b85658aaeb3dd088a324276f

diff --git a/manifest b/manifest
index 6f0a9d5028ca9c7281ce283e61a27ab06d0f51f4..e6b4494df32b84113f6ce591e49335fb4416df32 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\sdefinition\sof\sSQLITE_CONFIG_PAGECACHE\sand\nSQLITE_CONFIG_SCRATCH\sto\somit\sthe\smagic\s"+4"\sin\sthe\sbuffer\ssize\ncalculation.\s(CVS\s5512)
-D 2008-07-31T17:16:05
+C Update\sthe\smemsubsys1\stest\sscript\sto\stake\sinto\saccount\sthe\sbuffer\ssize\nchanges\sof\sthe\sprevious\scheck-in.\s(CVS\s5513)
+D 2008-07-31T17:20:59
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in bbb62eecc851379aef5a48a1bf8787eb13e6ec06
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -414,7 +414,7 @@ F test/malloc_common.tcl 17d60dfefc1598d1a7fe6da6511933536caea1d7
 F test/manydb.test 8de36b8d33aab5ef295b11d9e95310aeded31af8
 F test/memdb.test a67bda4ff90a38f2b19f6c7f95aa7289e051d893
 F test/memleak.test d2d2a1ff7105d32dc3fdf691458cf6cba58c7217
-F test/memsubsys1.test 567ec52e742b669fac69cec303a93aead9377ce3
+F test/memsubsys1.test 45c873e6c31bf70389048e3e0fd63191c75a99f6
 F test/memsubsys2.test c05b541f9c2a1234a9dc2ff2233b3a9544fa5139
 F test/minmax.test 722d80816f7e096bf2c04f4111f1a6c1ba65453d
 F test/minmax2.test 33504c01a03bd99226144e4b03f7631a274d66e0
@@ -614,7 +614,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P e7fdd813ccdefab33aedbcf7f44e13b935dd3299
-R 0da2bc60a3b7ef28cf0581731b3646dc
+P e7ed0fe640a39053009eac52a7f055b121750e57
+R e7803177fad1994208c0c231f00cf8c8
 U drh
-Z f0ba0aa5b2784db3a79cd7c3deea3b55
+Z ee197dce3f8e29de114bf6a5d78c4a0d

diff --git a/manifest.uuid b/manifest.uuid
index a210cacff4a9eadc5986dba8c036a02317a89f2d..ff5af9bf96cc672b32d20e35992ca9e1a88ec1a5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e7ed0fe640a39053009eac52a7f055b121750e57
\ No newline at end of file
+d43ff7bb8fc59c54b85658aaeb3dd088a324276f
\ No newline at end of file

diff --git a/test/memsubsys1.test b/test/memsubsys1.test
index 0c0b12b7a6944561ae041db5007eb996aef85cdf..ccc5166789b04461109a5a2c9b19e201a3a7d515 100644 (file)
--- a/test/memsubsys1.test
+++ b/test/memsubsys1.test
@@ -11,7 +11,7 @@
 #
 # This file contains tests of the memory allocation subsystem
 #
-# $Id: memsubsys1.test,v 1.6 2008/07/28 19:34:54 drh Exp $
+# $Id: memsubsys1.test,v 1.7 2008/07/31 17:20:59 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -77,7 +77,7 @@ do_test memsubsys1-2.3 {
 } $max_pagecache
 do_test memsubsys1-2.4 {
   set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
-} 20
+} 19
 do_test memsubsys1-2.5 {
   set s_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2]
 } 0
@@ -111,7 +111,7 @@ do_test memsubsys1-3.2.3 {
 } 2048
 do_test memsubsys1-3.2.4 {
   set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
-} 20
+} 19
 do_test memsubsys1-3.2.5 {
   set s_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2]
 } 0
@@ -127,7 +127,7 @@ build_test_db memsubsys1-4 {PRAGMA page_size=1024}
 #show_memstats
 do_test memsubsys1-4.3 {
   set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
-} 50
+} 49
 do_test memsubsys1-4.4 {
   set pg_ovfl [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_OVERFLOW 0] 2]
   set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
@@ -153,7 +153,7 @@ build_test_db memsubsys1-5 {PRAGMA page_size=4096}
 #show_memstats
 do_test memsubsys1-5.3 {
   set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
-} 24
+} 23
 do_test memsubsys1-5.4 {
   set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
   expr {$maxreq>4096}
@@ -178,7 +178,7 @@ build_test_db memsubsys1-6 {PRAGMA page_size=4096}
 #show_memstats
 do_test memsubsys1-6.3 {
   set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
-} 24
+} 23
 do_test memsubsys1-6.4 {
   set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
 } 4096