Disable the new malloc-37 test when locking_mode==exclusive. The test

basically works, but sometimes reports "database is locked" instead of
"out of memory" and that messes up the error reporting. (CVS 6811)

FossilOrigin-Name: 3b8f9dec24d06865455a75587bbfc199c19c6215

diff --git a/manifest b/manifest
index 0e8ed386e7167fecf3192c537486620c249fb007..8226e59a079bab00f7121065e30e2e1faeee1e0b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\sdeclaration\sof\sthe\ssqlite3Assert()\sfunction\sthat\swas\sdeleted\sby\sthe\nprevious\scheck-in.\s(CVS\s6810)
-D 2009-06-24T11:08:14
+C Disable\sthe\snew\smalloc-37\stest\swhen\slocking_mode==exclusive.\s\sThe\stest\nbasically\sworks,\sbut\ssometimes\sreports\s"database\sis\slocked"\sinstead\sof\n"out\sof\smemory"\sand\sthat\smesses\sup\sthe\serror\sreporting.\s(CVS\s6811)
+D 2009-06-24T13:13:45
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 8b8fb7823264331210cddf103831816c286ba446
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -445,7 +445,7 @@ F test/lock6.test 862aa71e97b288d6b3f92ba3313f51bd0b003776
 F test/lookaside.test 1dd350dc6dff015c47c07fcc5a727a72fc5bae02
 F test/main.test 347ab987f16167858781383427476b33dc69fdb7
 F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9
-F test/malloc.test 2d33aed76c2aab4689aef0a8cbf0c8d48bacbf37
+F test/malloc.test 7d7e1f04e6c2f338965e4220f2653f8b34ad3ee5
 F test/malloc3.test 4bc57f850b212f706f3e1b37c4eced1d5a727cd1
 F test/malloc4.test 957337613002b7058a85116493a262f679f3a261
 F test/malloc5.test 4d16d1bb26d2deddd7c4f480deec341f9b2d0e22
@@ -737,7 +737,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P d8fc373fef22311e1c6b5bce6d3e601217a69940
-R 8205f31af8ce6a950c1c1bc8f8af19df
+P ee20b6a23fa4a4ec4d3a2d0dcfcabff466f08246
+R 0331d4b5d6812279677260dc45e88b22
 U drh
-Z 9bdabd676d3ef6a8d58b110811cf5855
+Z 57f4b55306ec2a2991e394a845e2f814

diff --git a/manifest.uuid b/manifest.uuid
index 5b61a67a123148e48635e11e1e53b4321246edfa..108eb443688cdb5eafc31f0c9bf24964137e76c6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ee20b6a23fa4a4ec4d3a2d0dcfcabff466f08246
\ No newline at end of file
+3b8f9dec24d06865455a75587bbfc199c19c6215
\ No newline at end of file

diff --git a/test/malloc.test b/test/malloc.test
index 2ea93204fea77791ea20088b350dbf3640e50cf1..e88bc5071a8492475d0572f607d318441fb4e2af 100644 (file)
--- a/test/malloc.test
+++ b/test/malloc.test
@@ -16,7 +16,7 @@
 # to see what happens in the library if a malloc were to really fail
 # due to an out-of-memory situation.
 #
-# $Id: malloc.test,v 1.80 2009/06/22 05:43:24 danielk1977 Exp $
+# $Id: malloc.test,v 1.81 2009/06/24 13:13:45 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -843,26 +843,28 @@ do_malloc_test 36 -sqlprep {
 
 # At one point, if an OOM occured immediately after obtaining a shared lock
 # on the database file, the file remained locked. This test case ensures
-# that bug has been fixed.
-do_malloc_test 36 -tclprep {
-  sqlite3 db2 test.db
-  execsql {
-    CREATE TABLE t1(a, b);
-    INSERT INTO t1 VALUES(1, 2);
-  } db2
-} -sqlbody {
-  SELECT * FROM t1;
-} -cleanup {
-  # Try to write to the database using connection [db2]. If connection [db]
-  # has correctly released the shared lock, this write attempt should 
-  # succeed. If [db] has not released the lock, this should hit an 
-  # SQLITE_BUSY error.
-  do_test malloc-36.$zRepeat.${::n}.unlocked {
-    execsql {INSERT INTO t1 VALUES(3, 4)} db2
-  } {}
-  db2 close
+# that bug has been fixed.i
+if {[db eval {PRAGMA locking_mode}]!="exclusive"} {
+  do_malloc_test 37 -tclprep {
+    sqlite3 db2 test.db
+    execsql {
+      CREATE TABLE t1(a, b);
+      INSERT INTO t1 VALUES(1, 2);
+    } db2
+  } -sqlbody {
+    SELECT * FROM t1;
+  } -cleanup {
+    # Try to write to the database using connection [db2]. If connection [db]
+    # has correctly released the shared lock, this write attempt should 
+    # succeed. If [db] has not released the lock, this should hit an 
+    # SQLITE_BUSY error.
+    do_test malloc-36.$zRepeat.${::n}.unlocked {
+      execsql {INSERT INTO t1 VALUES(3, 4)} db2
+    } {}
+    db2 close
+  }
+  catch { db2 close }
 }
-catch { db2 close }
 
 # Ensure that no file descriptors were leaked.
 do_test malloc-99.X {