Exclude a test case from the inmemory_journal permutation of multiplex.test.

FossilOrigin-Name: 474196d6452f5868a712a9b0116d5f64c90d67c1

diff --git a/manifest b/manifest
index c04caf31ac05bf06e32fe8b41cd4c23dcdf83565..81495203482b5f2d627f801748ad41783a936470 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\s(harmless)\svalgrind\swarning\sin\sthe\srtree\sextension.
-D 2010-12-02T11:24:58
+C Exclude\sa\stest\scase\sfrom\sthe\sinmemory_journal\spermutation\sof\smultiplex.test.
+D 2010-12-02T14:47:06
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -565,7 +565,7 @@ F test/misc5.test 45b2e3ed5f79af2b4f38ae362eaf4c49674575bd
 F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
 F test/misc7.test 29032efcd3d826fbd409e2a7af873e7939f4a4e3
 F test/misuse.test 30b3a458e5a70c31e74c291937b6c82204c59f33
-F test/multiplex.test 6ceff2b3a5d43f849c267f66bb81adbaec1d5eca
+F test/multiplex.test 92a4839213fd8cba8b59f86d42b7a1da1857db39
 F test/mutex1.test 5b71777fc127509cd257910c8db799de557a02de
 F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660
 F test/nan.test a44e04df1486fcfb02d32468cbcd3c8e1e433723
@@ -893,7 +893,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 917af565ac0c71c14fcba56632e687ed938a856c
-R 43bbc2c83d0d7a219b1743fe660c6fcd
+P a94b9a395e0be9549d8c28e2b86b995c73c7b671
+R 741b538e8e95750c9262dc17abfd3a28
 U dan
-Z 8d480d9e765294bce9f398dfb5ca2da5
+Z 849f041b0ecb0da6b497679389cd2d3a

diff --git a/manifest.uuid b/manifest.uuid
index da1605376a160c31780833c6ad2c288e756564a0..2d1284b815da50ef3f2b1fff782d2cd8e3c4729d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a94b9a395e0be9549d8c28e2b86b995c73c7b671
\ No newline at end of file
+474196d6452f5868a712a9b0116d5f64c90d67c1
\ No newline at end of file

diff --git a/test/multiplex.test b/test/multiplex.test
index cada18b6552fb108a716a4773c531a39bcdc569b..742ca5079e230b61916c5b5740b86c17d503090f 100644 (file)
--- a/test/multiplex.test
+++ b/test/multiplex.test
@@ -452,40 +452,47 @@ do_faultsim_test multiplex-5.5 -prep {
 }
 
 # test that mismatch filesize is detected
-set all_journal_modes {delete persist truncate memory off}
-foreach jmode $all_journal_modes {
-  do_test multiplex-5.6.1.$jmode {
-    sqlite3_multiplex_shutdown
-    multiplex_delete test.db
-    sqlite3 db test.db
-    db eval {
-      PRAGMA page_size = 1024;
-      PRAGMA auto_vacuum = off;
-    }
-    db eval "PRAGMA journal_mode = $jmode;"
-  } $jmode
-  do_test multiplex-5.6.2.$jmode {
-    execsql {
-      CREATE TABLE t1(a, b);
-      INSERT INTO t1 VALUES(1, randomblob(1100));
-      INSERT INTO t1 VALUES(2, randomblob(1100));
-      INSERT INTO t1 VALUES(3, randomblob(1100));
-      INSERT INTO t1 VALUES(4, randomblob(1100));
-      INSERT INTO t1 VALUES(5, randomblob(1100));
-    }
-    db close
-    sqlite3_multiplex_initialize "" 1
-    multiplex_set 4096 16
-    sqlite3 db test.db
-  } {}
-  do_test multiplex-5.6.3.$jmode {
-    catchsql {
-      INSERT INTO t1 VALUES(6, randomblob(1100));
-    }
-  } {1 {disk I/O error}}
-  do_test multiplex-5.6.4.$jmode {
-    db close
-  } {}
+#
+# Do not run this test if $::G(perm:presql) is set. If it is set, then the
+# expected IO error will occur within the Tcl [sqlite3] wrapper, not within
+# the first SQL statement executed below. This breaks the test case.
+#
+if {0==[info exists ::G(perm:presql)] || $::G(perm:presql) == ""} {
+  set all_journal_modes {delete persist truncate memory off}
+  foreach jmode $all_journal_modes {
+    do_test multiplex-5.6.1.$jmode {
+      sqlite3_multiplex_shutdown
+      multiplex_delete test.db
+      sqlite3 db test.db
+      db eval {
+        PRAGMA page_size = 1024;
+        PRAGMA auto_vacuum = off;
+      }
+      db eval "PRAGMA journal_mode = $jmode;"
+    } $jmode
+    do_test multiplex-5.6.2.$jmode {
+      execsql {
+        CREATE TABLE t1(a, b);
+        INSERT INTO t1 VALUES(1, randomblob(1100));
+        INSERT INTO t1 VALUES(2, randomblob(1100));
+        INSERT INTO t1 VALUES(3, randomblob(1100));
+        INSERT INTO t1 VALUES(4, randomblob(1100));
+        INSERT INTO t1 VALUES(5, randomblob(1100));
+      }
+      db close
+      sqlite3_multiplex_initialize "" 1
+      multiplex_set 4096 16
+      sqlite3 db test.db
+    } {}
+    do_test multiplex-5.6.3.$jmode {
+      catchsql {
+        INSERT INTO t1 VALUES(6, randomblob(1100));
+      }
+    } {1 {disk I/O error}}
+    do_test multiplex-5.6.4.$jmode {
+      db close
+    } {}
+  }
 }
 
 catch { sqlite3_multiplex_shutdown }