Fix test instrumentation problems on shared_err.test. (CVS 4728)

FossilOrigin-Name: 5aef5b0dd8e44a56f84fbc6f843016bca5101987

diff --git a/manifest b/manifest
index ce780cf0f54b6349043d1975374756bf15e26812..8061f8a6db67d2b9893617233a327b84d1533d1c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sabsolute\spath\sfrom\scrash5.test.\s(CVS\s4727)
-D 2008-01-18T14:17:21
+C Fix\stest\sinstrumentation\sproblems\son\sshared_err.test.\s(CVS\s4728)
+D 2008-01-18T17:03:33
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 30789bf70614bad659351660d76b8e533f3340e9
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -377,7 +377,7 @@ F test/mallocC.test 9daac0aa8e5b0afa7b0a3fb0cd792f02fe0cc838
 F test/mallocD.test d638fb8f214b47fd31edfae8af738b92bd943dc0
 F test/mallocE.test e15333c394d7c330c8372a7cdf7b0f7c16573082
 F test/mallocF.test e1804792a6365ad43589b26608850a38e491170a
-F test/malloc_common.tcl 773db5a49300d650f6578eb44d42ad7dd11f8563
+F test/malloc_common.tcl 262c71dd4af005bc3a6b8fe449237688255072a0
 F test/manydb.test 8de36b8d33aab5ef295b11d9e95310aeded31af8
 F test/memdb.test a67bda4ff90a38f2b19f6c7f95aa7289e051d893
 F test/memleak.test d2d2a1ff7105d32dc3fdf691458cf6cba58c7217
@@ -427,7 +427,7 @@ F test/server1.test f5b790d4c0498179151ca8a7715a65a7802c859c
 F test/shared.test 9a1e81629efaebaad2247e9e81aa33570fba8f13
 F test/shared2.test 0ee9de8964d70e451936a48c41cb161d9134ccf4
 F test/shared3.test 01e3e124dbb3859788aabc7cfb82f7ea04421749
-F test/shared_err.test bfe49fbbf26746a3c05255b1dc7230744182b744
+F test/shared_err.test 202ce115a4bfab2b41da5d4c9431f68a474134a6
 F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
 F test/sidedelete.test 736ac1da08b3b1aa62df97fef2fcdb1b660111b9
 F test/soak.test 64f9b27fbcdec43335a88c546ce1983e6ba40d7b
@@ -607,7 +607,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 0e50c0200a3c1c04e63cbb55a7255cdbbd225347
-R 3753b0c2de5fbbcc041b9b25fee133ae
-U danielk1977
-Z b72303278d403e250382104a3d30e8dd
+P 42d8a377551baef01fb4e80f35fc12f9454a3cd4
+R 53a68cbdb5a0c09e7f3102caf81464df
+U drh
+Z f8720638d058f6048f391f0665e9a25c

diff --git a/manifest.uuid b/manifest.uuid
index 45da21b5ee9899d3f46dc6867d47634b1f335a1b..4212cb612b0af4ddd2edd06fa34c72f8d6b8337b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-42d8a377551baef01fb4e80f35fc12f9454a3cd4
\ No newline at end of file
+5aef5b0dd8e44a56f84fbc6f843016bca5101987
\ No newline at end of file

diff --git a/test/malloc_common.tcl b/test/malloc_common.tcl
index 15f6252f9e9ab3e20541bbdf5888f45fd2562f0a..f06dbbe84a0814daddc6c6b053913ef21d548129 100644 (file)
--- a/test/malloc_common.tcl
+++ b/test/malloc_common.tcl
@@ -12,7 +12,7 @@
 # This file contains common code used by many different malloc tests
 # within the test suite.
 #
-# $Id: malloc_common.tcl,v 1.10 2008/01/16 17:46:38 drh Exp $
+# $Id: malloc_common.tcl,v 1.11 2008/01/18 17:03:33 drh Exp $
 
 # If we did not compile with malloc testing enabled, then do nothing.
 #
@@ -56,11 +56,16 @@ proc do_malloc_test {tn args} {
   } else {
     set start 0
   }
+  if {[info exists ::mallocopts(-end)]} {
+    set end $::mallocopts(-end)
+  } else {
+    set end 50000
+  }
   save_prng_state
 
   foreach ::iRepeat {0 1} {
     set ::go 1
-    for {set ::n $start} {$::go && $::n < 50000} {incr ::n} {
+    for {set ::n $start} {$::go && $::n <= $end} {incr ::n} {
 
       # If $::iRepeat is 0, then the malloc() failure is transient - it
       # fails and then subsequent calls succeed. If $::iRepeat is 1, 

diff --git a/test/shared_err.test b/test/shared_err.test
index 7c1794aabf9fc529625ecf5002a9c658cf761c2a..4c6214a387d5a75d726bdb8602e8f73884e44799 100644 (file)
--- a/test/shared_err.test
+++ b/test/shared_err.test
@@ -13,7 +13,7 @@
 # cache context. What happens to connection B if one connection A encounters
 # an IO-error whilst reading or writing the file-system?
 #
-# $Id: shared_err.test,v 1.17 2007/09/03 16:12:10 drh Exp $
+# $Id: shared_err.test,v 1.18 2008/01/18 17:03:33 drh Exp $
 
 proc skip {args} {}
 
@@ -112,6 +112,7 @@ do_ioerr_test shared_ioerr-2 -tclprep {
 
   incr ::residx
 } -cleanup {
+  catchsql ROLLBACK
   do_test shared_ioerr-2.$n.cleanup.1 {
     set res [catchsql {
       SELECT max(a), min(a), count(*) FROM (SELECT a FROM t1 order by a);
@@ -343,7 +344,8 @@ do_malloc_test shared_err-4 -tclprep {
   }
   do_test shared_malloc-4.$::n.cleanup.3 {
    set rc [sqlite3_finalize $::STMT]
-   expr {$rc=="SQLITE_OK" || $rc=="SQLITE_ABORT" || $rc=="SQLITE_NOMEM"}
+   expr {$rc=="SQLITE_OK" || $rc=="SQLITE_ABORT" ||
+         $rc=="SQLITE_NOMEM" || $rc=="SQLITE_IOERR"}
   } {1}
 # db2 eval {select * from sqlite_master}
   db2 close
@@ -411,10 +413,14 @@ do_malloc_test shared_err-8 -tclprep {
   }
 } -cleanup {
   do_test shared_malloc-8.$::n.cleanup.1 {
-    lrange [execsql {
-      SELECT a FROM t1;
-    } db2] 0 1
-  } {0000000000 1111111111}
+    set res [catchsql {SELECT a FROM t1} db2]
+    set ans [lindex $res 1]
+    if {[lindex $res 0]} {
+       set r [expr {$ans=="disk I/O error"}]
+    } else {
+       set r [expr {[lrange $ans 0 1]=="0000000000 1111111111"}]
+    }
+  } {1}
   do_test shared_malloc-8.$::n.cleanup.2 {
     set rc1 [sqlite3_step $::STMT]
     set rc2 [sqlite3_finalize $::STMT]
@@ -424,7 +430,8 @@ do_malloc_test shared_err-8 -tclprep {
     expr {
       ($rc1=="SQLITE_DONE" && $rc2=="SQLITE_OK") || 
       ($rc1=="SQLITE_ERROR" && $rc2=="SQLITE_ABORT") ||
-      ($rc1=="SQLITE_ERROR" && $rc2=="SQLITE_NOMEM")
+      ($rc1=="SQLITE_ERROR" && $rc2=="SQLITE_NOMEM") ||
+      ($rc1=="SQLITE_ERROR" && $rc2=="SQLITE_IOERR")
     }
   } {1}
   db2 close