Fix jrnlmode.test so that it does not run tests involving in-memory journals during...

FossilOrigin-Name: b47ddefc772ee59aa1509ab8d8f229a3d7c4ddaf

diff --git a/manifest b/manifest
index 1a016689040a8ed2b16f0a00abfe0251ed690daa..146df8d296623366b5cb6399167628cab1428546 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\scrash8.test\sdepends\son\sauto_vacuum\sbeing\soff.\s\sMake\ssure\sthat\sis\sthe\ncase.\s(CVS\s6165)
-D 2009-01-11T00:44:48
+C Fix\sjrnlmode.test\sso\sthat\sit\sdoes\snot\srun\stests\sinvolving\sin-memory\sjournals\sduring\sthe\s"journaltest"\spermutation.\s(CVS\s6166)
+D 2009-01-11T05:54:40
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 05461a9b5803d5ad10c79f989801e9fd2cc3e592
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -413,7 +413,7 @@ F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0
 F test/join4.test 1a352e4e267114444c29266ce79e941af5885916
 F test/join5.test 86675fc2919269aa923c84dd00ee4249b97990fe
 F test/journal1.test 36f2d1bb9bf03f790f43fbdb439e44c0657fab19
-F test/jrnlmode.test a77f95a7cbdc8373582fd274f24124ad0d3a8fb6
+F test/jrnlmode.test 32e79fa272e78ff3b734aac08db886f98f84165a
 F test/lastinsert.test 474d519c68cb79d07ecae56a763aa7f322c72f51
 F test/laststmtchanges.test ae613f53819206b3222771828d024154d51db200
 F test/like.test 22f7857f9d7da7ff5061ded8806c43a6271109fc
@@ -696,7 +696,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 1e79f4f9e59469fb9e3e0007163de3e604dcf00f
-R 6f197d93d4204d4762b9c79ff2334ddc
-U drh
-Z a344398c9dc28d3b08b3e0c830a9ef34
+P 3538d2a981c5abfe2f88aec75175ae33475e6bcb
+R 4459dabcc4e78672bb21a712abcaf430
+U danielk1977
+Z f400556842edfa7ff5eb0722c1cbc7ba

diff --git a/manifest.uuid b/manifest.uuid
index ec29f4cc158d0c0f0293b8c17ba2078ab97e4fd0..44b1286732a753472ace323d04e64fbe3bf4901c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3538d2a981c5abfe2f88aec75175ae33475e6bcb
\ No newline at end of file
+b47ddefc772ee59aa1509ab8d8f229a3d7c4ddaf
\ No newline at end of file

diff --git a/test/jrnlmode.test b/test/jrnlmode.test
index 540928de1b0894a21a63148006c510091d354b1a..330188adb89395c0cd751583cba01669a7610d00 100644 (file)
--- a/test/jrnlmode.test
+++ b/test/jrnlmode.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library. The focus
 # of these tests is the journal mode pragma.
 #
-# $Id: jrnlmode.test,v 1.11 2009/01/10 16:15:09 danielk1977 Exp $
+# $Id: jrnlmode.test,v 1.12 2009/01/11 05:54:40 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -439,43 +439,48 @@ ifcapable pragma {
 }
 
 ifcapable pragma {
-  do_test jrnlmode-6.1 {
-    execsql {
-      PRAGMA journal_mode = truncate;
-      CREATE TABLE t4(a, b);
-      BEGIN;
-        INSERT INTO t4 VALUES(1, 2);
-        PRAGMA journal_mode = memory;
-    }
-  } {truncate memory}
-  do_test jrnlmode-6.2 {
-    file exists test.db-journal
-  } {1}
-  do_test jrnlmode-6.3 {
-    execsql {
-      COMMIT;
-      SELECT * FROM t4;
-    }
-  } {1 2}
-  do_test jrnlmode-6.4 {
-    file exists test.db-journal
-  } {0}
-  do_test jrnlmode-6.5 {
-    execsql {
-      BEGIN;
-        INSERT INTO t4 VALUES(3, 4);
-    }
-    file exists test.db-journal
-  } {0}
-  do_test jrnlmode-6.7 {
-    execsql {
-      COMMIT;
-      SELECT * FROM t4;
-    }
-  } {1 2 3 4}
-  do_test jrnlmode-6.8 {
-    file exists test.db-journal
-  } {0}
+  # These tests are not run as part of the "journaltest" permutation,
+  # as the test_journal.c layer is incompatible with in-memory journaling.
+  if {[catch {set ::permutations_test_prefix} z] || $z ne "journaltest"} {
+
+    do_test jrnlmode-6.1 {
+      execsql {
+        PRAGMA journal_mode = truncate;
+        CREATE TABLE t4(a, b);
+        BEGIN;
+          INSERT INTO t4 VALUES(1, 2);
+          PRAGMA journal_mode = memory;
+      }
+    } {truncate memory}
+    do_test jrnlmode-6.2 {
+      file exists test.db-journal
+    } {1}
+    do_test jrnlmode-6.3 {
+      execsql {
+        COMMIT;
+        SELECT * FROM t4;
+      }
+    } {1 2}
+    do_test jrnlmode-6.4 {
+      file exists test.db-journal
+    } {0}
+    do_test jrnlmode-6.5 {
+      execsql {
+        BEGIN;
+          INSERT INTO t4 VALUES(3, 4);
+      }
+      file exists test.db-journal
+    } {0}
+    do_test jrnlmode-6.7 {
+      execsql {
+        COMMIT;
+        SELECT * FROM t4;
+      }
+    } {1 2 3 4}
+    do_test jrnlmode-6.8 {
+      file exists test.db-journal
+    } {0}
+  }
 }
 
 finish_test