From: dan <dan@noemail.net>
Date: Mon, 4 Oct 2010 16:06:11 +0000 (+0000)
Subject: Fix a couple of test script problems.
X-Git-Tag: version-3.7.4~114
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4eb82f6cf86df33685705d64ff6d353573567c3;p=thirdparty%2Fsqlite.git

Fix a couple of test script problems.

FossilOrigin-Name: dd106901407a4d98644dd614e16e9fdc10cd7423
---

diff --git a/manifest b/manifest
index 54b9aca742..e3884c4de0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\smemsubsys1.test\sso\sthat\sit\sworks\swith\sTEMP_STORE>=2.
-D 2010-10-04T15:47:31
+C Fix\sa\scouple\sof\stest\sscript\sproblems.
+D 2010-10-04T16:06:12
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -476,7 +476,7 @@ F test/intarray.test 066b7d7ac38d25bf96f87f1b017bfc687551cdd4
 F test/interrupt.test 42e7cf98646fd9cb4a3b131a93ed3c50b9e149f1
 F test/intpkey.test 537669fd535f62632ca64828e435b9e54e8d677f
 F test/io.test 1b895d6774491895cbc75659969f07ca01860c88
-F test/ioerr.test e124b97c13e6fe8eac9b892b82ef3541c2cea9c7
+F test/ioerr.test 622aebd2f24779cafaf5dd3e3c2b349ce40ade3b
 F test/ioerr2.test 1b56cb80d5b0726ee3ba325ca175734541e32955
 F test/ioerr3.test d3cec5e1a11ad6d27527d0d38573fbff14c71bdd
 F test/ioerr4.test fc6eddfec2efc2f1ed217b9eae4c1c1d3516ce86
@@ -675,7 +675,7 @@ F test/tkt-b351d95f9.test d14a503c414c5c58fdde3e80f9a3cfef986498c0
 F test/tkt-cbd054fa6b.test f14f97ea43662e6f70c9e63287081e8be5d9d589
 F test/tkt-d11f09d36e.test fb44f7961aa6d4b632fb7b9768239832210b5fc7
 F test/tkt-d82e3f3721.test 731359dfdcdb36fea0559cd33fec39dd0ceae8e6
-F test/tkt-f3e5abed55.test 91713833e266fbdc60f2030e05647ad4762073f6
+F test/tkt-f3e5abed55.test 19fb59268da6f20a69a181b9c14154132d1c65e3
 F test/tkt-f777251dc7a.test 6f24c053bc5cdb7e1e19be9a72c8887cf41d5e87
 F test/tkt-f973c7ac31.test 1da0ed15ec2c7749fb5ce2828cd69d07153ad9f4
 F test/tkt-fc62af4523.test 72825d3febdedcd5593a27989fc05accdbfc2bb4
@@ -872,7 +872,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P cde62657d6f410a3d6899cd7b4000d276fe3c813
-R 49126d9c74d0eaed4bcfd4c221e96cd4
+P 8ad88ee0c1145eb9f92267c31d7d787739718716
+R 3062623d0ad76429d2e484f95cd0fcaf
 U dan
-Z eda4eb19dd9a732f4cfaa7ac88704061
+Z 126f912f656c0260d2a9bacbd10d60fe
diff --git a/manifest.uuid b/manifest.uuid
index 6fe70c5584..f3ba745424 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8ad88ee0c1145eb9f92267c31d7d787739718716
\ No newline at end of file
+dd106901407a4d98644dd614e16e9fdc10cd7423
\ No newline at end of file
diff --git a/test/ioerr.test b/test/ioerr.test
index 311515302d..f9b95555ca 100644
--- a/test/ioerr.test
+++ b/test/ioerr.test
@@ -135,8 +135,13 @@ ifcapable attach {
 
 # Test IO errors when replaying two hot journals from a 2-file 
 # transaction. This test only runs on UNIX.
+#
+# It cannot be run under the "exclusive" permutation. In that case, the
+# locks held by the connection in the local (this) process prevent a 
+# second connection from attempting the multi-file transaction.
+#
 ifcapable crashtest&&attach {
-  if {![catch {sqlite3 -has-codec} r] && !$r} {
+  if {![catch {sqlite3 -has-codec} r] && !$r && [permutation]!="exclusive"} {
     do_ioerr_test ioerr-6 -ckrefcount true -tclprep {
       execsql {
         ATTACH 'test2.db' as aux;
diff --git a/test/tkt-f3e5abed55.test b/test/tkt-f3e5abed55.test
index d574480b24..241c1612e0 100644
--- a/test/tkt-f3e5abed55.test
+++ b/test/tkt-f3e5abed55.test
@@ -61,53 +61,57 @@ db2 close
 # file "test.db-journal", a snapshot of the current file-system contents
 # is taken.
 #
-testvfs tvfs -default 1
-tvfs script xDelete
-tvfs filter xDelete
-proc xDelete {method file args} {
-  if {[file tail $file] == "test.db-journal"} {
-    faultsim_save
-    tvfs filter {}
+# This test will not work with an in-memory journal.
+#
+if {[permutation]!="inmemory_journal"} {
+  testvfs tvfs -default 1
+  tvfs script xDelete
+  tvfs filter xDelete
+  proc xDelete {method file args} {
+    if {[file tail $file] == "test.db-journal"} {
+      faultsim_save
+      tvfs filter {}
+    }
+    return "SQLITE_OK"
   }
-  return "SQLITE_OK"
+  
+  sqlite3 db  test.db
+  sqlite3 db2 test.db
+  do_test tkt-f3e5abed55-2.1 {
+    execsql {
+      ATTACH 'test.db2' AS aux;
+      BEGIN;
+        INSERT INTO t1 VALUES(3, 4);
+        INSERT INTO t2 VALUES(3, 4);
+    }
+  } {}
+  do_test tkt-f3e5abed55-2.2 {
+    execsql { BEGIN; SELECT * FROM t1 } db2
+  } {1 2}
+  do_test tkt-f3e5abed55-2.3 {
+    catchsql COMMIT
+  } {1 {database is locked}}
+  
+  do_test tkt-f3e5abed55-2.4 {
+    execsql COMMIT db2
+    execsql {
+      COMMIT;
+      SELECT * FROM t1;
+      SELECT * FROM t2;
+    }
+  } {1 2 3 4 1 2 3 4}
+  do_test tkt-f3e5abed55-2.5 {
+    db close
+    db2 close
+    faultsim_restore_and_reopen
+    execsql {
+      ATTACH 'test.db2' AS aux;
+      SELECT * FROM t1;
+      SELECT * FROM t2;
+    }
+  } {1 2 3 4 1 2 3 4}
 }
 
-sqlite3 db  test.db
-sqlite3 db2 test.db
-do_test tkt-f3e5abed55-2.1 {
-  execsql {
-    ATTACH 'test.db2' AS aux;
-    BEGIN;
-      INSERT INTO t1 VALUES(3, 4);
-      INSERT INTO t2 VALUES(3, 4);
-  }
-} {}
-do_test tkt-f3e5abed55-2.2 {
-  execsql { BEGIN; SELECT * FROM t1 } db2
-} {1 2}
-do_test tkt-f3e5abed55-2.3 {
-  catchsql COMMIT
-} {1 {database is locked}}
-
-do_test tkt-f3e5abed55-2.4 {
-  execsql COMMIT db2
-  execsql {
-    COMMIT;
-    SELECT * FROM t1;
-    SELECT * FROM t2;
-  }
-} {1 2 3 4 1 2 3 4}
-do_test tkt-f3e5abed55-2.5 {
-  db close
-  db2 close
-  faultsim_restore_and_reopen
-  execsql {
-    ATTACH 'test.db2' AS aux;
-    SELECT * FROM t1;
-    SELECT * FROM t2;
-  }
-} {1 2 3 4 1 2 3 4}
-
 
 finish_test