Update tests so that they work properly even if the soft-heap-limit

is set low. (CVS 4203)

FossilOrigin-Name: e01eb99edfa3390e97847a210532847cc64803da

diff --git a/manifest b/manifest
index 54846eb777853761214239cb2d2d52107a50e703..78c474fd9c6fd11b71374876d640a264a9fb0f96 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\s--soft-heap-limit=N\soption\sto\sthe\stest\sscripts.\s\sSet\sthis\svalue\sto\nenforce\sa\ssoft\sheap\slimit\sacross\sall\stests.\s\sThis\schanges\sexposes\sseveral\nnew\sbugs.\s(CVS\s4202)
-D 2007-08-10T16:41:09
+C Update\stests\sso\sthat\sthey\swork\sproperly\seven\sif\sthe\ssoft-heap-limit\nis\sset\slow.\s(CVS\s4203)
+D 2007-08-10T19:46:14
 F Makefile.in 0c0e53720f658c7a551046442dd7afba0b72bfbe
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -161,7 +161,7 @@ F test/analyze.test 2f55535aa335785db1a2f97d3f3831c16c09f8b0
 F test/async.test 464dc7c7ccb144e8c82ecca429e6d7cd1c96bd6e
 F test/async2.test 81e4a1fd010c903eb3b763fdb4c4cad7a99afb14
 F test/attach.test cf289abdb120053136649efd1306ab9d47fa41b2
-F test/attach2.test 0e6a7c54343c85dd877a1e86073a05176043ed40
+F test/attach2.test 78bc1a25ea8785c7571b44f5947ada2bd5d78127
 F test/attach3.test eafcafb107585aecc2ed1569a77914138eef46a9
 F test/attachmalloc.test 03eeddd06e685ddbe975efd51824e4941847e5f4
 F test/auth.test 66923137cf78475f5671b5e6e6274935e055aea0
@@ -191,7 +191,7 @@ F test/busy.test 0271c854738e23ad76e10d4096a698e5af29d211
 F test/cache.test 9e530b55ba016ca17439f728a06898f0ade5f1da
 F test/capi2.test 7ecc9b342cc9ec27b53bbf95724cf2e5874fd496
 F test/capi3.test 1cf80839d6224126acf82eb824308981fb054ef9
-F test/capi3b.test 5f0bc94b104e11086b1103b20277e1910f59c7f4
+F test/capi3b.test 664eb55318132f292f2c436f90906f578cad6b97
 F test/capi3c.test 76a3fb94755288a2977ee387e95305e6224c0198
 F test/cast.test 0302bbc8d1be2f94da1e16ad2eb01ea356e26d18
 F test/check.test 024ed399600b799160378cf9d9f436bdf5dfd184
@@ -523,7 +523,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 4333b231af8866e3d2d75bc64083b6c36c8da8d8
-R 59a1470063d9ac8d446eb8a6fbd0d1f5
+P 8be845981654d2a846c95c699395af222b6c3b43
+R 4f7973200fb8962875d87d3c791c258c
 U drh
-Z 7db05446b00beee77c01beded332074f
+Z e2088765e2200838211ac2419fa9b628

diff --git a/manifest.uuid b/manifest.uuid
index 33e53191db70ab51e4525b322537b6defb89dd29..a7d86a811562c67ba5b9db016e7b03dadbb2e545 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8be845981654d2a846c95c699395af222b6c3b43
\ No newline at end of file
+e01eb99edfa3390e97847a210532847cc64803da
\ No newline at end of file

diff --git a/test/attach2.test b/test/attach2.test
index 2d70c3bd0699395ccc58be91a74b989edc3e26f7..6e79f29946d3d55e0b4845690de906cb55df977b 100644 (file)
--- a/test/attach2.test
+++ b/test/attach2.test
@@ -12,7 +12,7 @@
 # focus of this script is testing the ATTACH and DETACH commands
 # and related functionality.
 #
-# $Id: attach2.test,v 1.35 2006/01/03 00:33:50 drh Exp $
+# $Id: attach2.test,v 1.36 2007/08/10 19:46:14 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -212,6 +212,15 @@ do_test attach2-4.4 {
 lock_status 4.4.1 db {main shared temp closed file2 unlocked}
 lock_status 4.4.2 db2 {main unlocked temp closed file2 unlocked}
 
+# We have to make sure that the cache_size and the soft_heap_limit
+# are large enough to hold the entire change in memory.  If either
+# is set too small, then changes will spill to the database, forcing
+# a reserved lock to promote to exclusive.  That will mess up our
+# test results. 
+
+set soft_limit [sqlite3_soft_heap_limit 0]
+
+
 do_test attach2-4.5 {
   # Handle 'db2' reserves file2.
   execsql {BEGIN} db2
@@ -314,6 +323,7 @@ do_test attach2-4.15 {
 db close
 db2 close
 file delete -force test2.db
+sqlite3_soft_heap_limit $soft_limit
 
 # These tests - attach2-5.* - check that the master journal file is deleted
 # correctly when a multi-file transaction is committed or rolled back.

diff --git a/test/capi3b.test b/test/capi3b.test
index 950d14c4fc0c65d9f122a5408a509b605523ab08..44790c7e84f58d64a76f527e1f9a7e381a7154df 100644 (file)
--- a/test/capi3b.test
+++ b/test/capi3b.test
@@ -13,13 +13,21 @@
 # particular the behavior of sqlite3_step() when trying to commit
 # with lock contention.
 #
-# $Id: capi3b.test,v 1.3 2006/01/03 00:33:50 drh Exp $
+# $Id: capi3b.test,v 1.4 2007/08/10 19:46:14 drh Exp $
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
 
+# These tests depend on the pager holding changes in cache
+# until it is time to commit.  But that won't happen if the
+# soft-heap-limit is set too low.  So disable the soft heap limit
+# for the duration of this test.
+#
+sqlite3_soft_heap_limit 0
+
+
 set DB [sqlite3_connection_pointer db]
 sqlite3 db2 test.db
 set DB2 [sqlite3_connection_pointer db2]
@@ -132,4 +140,6 @@ do_test capi3b-2.12 {
 } {1 2 3 4}
 
 catch {db2 close}
+
+sqlite3_soft_heap_limit $soft_limit
 finish_test