Skip tests that require WAL mode when it is not enabled.

FossilOrigin-Name: 6fc4ead26d19b9348bbda34c3053ae1e066abc32

diff --git a/manifest b/manifest
index 74e32143e0d030d48975cfccf0ab1cc1ea77344a..cf7c330a5e6f04de1943ebc87240848d0a53a973 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C For\sthe\sWin32\sVFS,\sallow\smemory\smapped\sfiles\sto\swork\swhen\scompiled\swithout\sWAL\ssupport.
-D 2014-11-04T19:37:22.576
+C Skip\stests\sthat\srequire\sWAL\smode\swhen\sit\sis\snot\senabled.
+D 2014-11-04T19:52:15.610
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -728,7 +728,7 @@ F test/misc5.test 528468b26d03303b1f047146e5eefc941b9069f5
 F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
 F test/misc7.test edd0b63e2ee29a256900b0514f6fff27e19e9bb2
 F test/misuse.test 3c34719944ba045cc6c188a4852ba04680728912
-F test/mmap1.test 93d167b328255cbe6679fe1e1a23be1b1197d07b
+F test/mmap1.test 1bfd611b9841eafb44f7d83c0788e146d84a33c9
 F test/mmap2.test 9d6dd9ddb4ad2379f29cc78f38ce1e63ed418022
 F test/mmap3.test c92273e16eb8d23c1d55c9815b446bb72ef0512e
 F test/mmapfault.test d4c9eff9cd8c2dc14bc43e71e042f175b0a26fe3
@@ -1211,10 +1211,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P d423349d2cd8bc7e04f3d90ca7bab11e1ad86e25
-R c0de55f8c674bc2f58a7f862c94a6470
-T *branch * winMmapNoWal
-T *sym-winMmapNoWal *
-T -sym-trunk *
+P 1fc7e2f3d34e25e7b59aa8b51d10c1e27ab4a527
+R ab0636a3afda48f38dd438546ea79dde
 U mistachkin
-Z 8ecf95ce02a024463c10f127838cfcbc
+Z 673ee028789258ee8d4aa78195cdb56d

diff --git a/manifest.uuid b/manifest.uuid
index e9b06734b6df2dc3ab3ea7243cb39f0d36ec179e..b10e2d0d51b71968dded9c4400eed21102bb7d41 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1fc7e2f3d34e25e7b59aa8b51d10c1e27ab4a527
\ No newline at end of file
+6fc4ead26d19b9348bbda34c3053ae1e066abc32
\ No newline at end of file

diff --git a/test/mmap1.test b/test/mmap1.test
index ece3e0201ed2aceb86cfc48e0adf7d9266a8c4bc..18aec9f8fa638e6e98776e83b6b6debea74e6a49 100644 (file)
--- a/test/mmap1.test
+++ b/test/mmap1.test
@@ -33,7 +33,7 @@ proc register_rblob_code {dbname seed} {
     set ::rcnt $seed
     proc rblob {n} {
       set ::rcnt [expr (([set ::rcnt] << 3) + [set ::rcnt] + 456) & 0xFFFFFFFF]
-      set str [format %.8x [expr [set ::rcnt] ^ 0xbdf20da3]] 
+      set str [format %.8x [expr [set ::rcnt] ^ 0xbdf20da3]]
       string range [string repeat [set str] [expr [set n]/4]] 1 [set n]
     }
     $dbname func rblob rblob
@@ -42,7 +42,7 @@ proc register_rblob_code {dbname seed} {
 
 # For cases 1.1 and 1.4, the number of pages read using xRead() is 4 on
 # unix and 9 on windows. The difference is that windows only ever maps
-# an integer number of OS pages (i.e. creates mappings that are a multiple 
+# an integer number of OS pages (i.e. creates mappings that are a multiple
 # of 4KB in size). Whereas on unix any sized mapping may be created.
 #
 foreach {t mmap_size nRead c2init} {
@@ -106,50 +106,52 @@ foreach {t mmap_size nRead c2init} {
 set ::rcnt 0
 proc rblob {n} {
   set ::rcnt [expr (($::rcnt << 3) + $::rcnt + 456) & 0xFFFFFFFF]
-  set str [format %.8x [expr $::rcnt ^ 0xbdf20da3]] 
+  set str [format %.8x [expr $::rcnt ^ 0xbdf20da3]]
   string range [string repeat $str [expr $n/4]] 1 $n
 }
 
 reset_db
 db func rblob rblob
 
-do_execsql_test 2.1 {
-  PRAGMA auto_vacuum = 1;
-  PRAGMA mmap_size = 67108864;
-  PRAGMA journal_mode = wal;
-  CREATE TABLE t1(a, b, UNIQUE(a, b));
-  INSERT INTO t1 VALUES(rblob(500), rblob(500));
-  INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --    2
-  INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --    4
-  INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --    8
-  INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --   16
-  INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --   32
-  PRAGMA wal_checkpoint;
-} {67108864 wal 0 103 103}
-
-do_execsql_test 2.2 {
-  PRAGMA auto_vacuum;
-  SELECT count(*) FROM t1;
-} {1 32}
-
-if {[permutation] != "inmemory_journal"} {
-  do_test 2.3 {
-    sqlite3 db2 test.db
-    db2 func rblob rblob
-    db2 eval { 
-      DELETE FROM t1 WHERE (rowid%4);
-        PRAGMA wal_checkpoint;
-    }
-    db2 eval { 
-      INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --    16
-      SELECT count(*) FROM t1;
-    }
-  } {16}
-
-  do_execsql_test 2.4 {
+ifcapable wal {
+  do_execsql_test 2.1 {
+    PRAGMA auto_vacuum = 1;
+    PRAGMA mmap_size = 67108864;
+    PRAGMA journal_mode = wal;
+    CREATE TABLE t1(a, b, UNIQUE(a, b));
+    INSERT INTO t1 VALUES(rblob(500), rblob(500));
+    INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --    2
+    INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --    4
+    INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --    8
+    INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --   16
+    INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --   32
     PRAGMA wal_checkpoint;
-  } {0 24 24}
-  db2 close
+  } {67108864 wal 0 103 103}
+
+  do_execsql_test 2.2 {
+    PRAGMA auto_vacuum;
+    SELECT count(*) FROM t1;
+  } {1 32}
+
+  if {[permutation] != "inmemory_journal"} {
+    do_test 2.3 {
+      sqlite3 db2 test.db
+      db2 func rblob rblob
+      db2 eval {
+        DELETE FROM t1 WHERE (rowid%4);
+          PRAGMA wal_checkpoint;
+      }
+      db2 eval {
+        INSERT INTO t1 SELECT rblob(500), rblob(500) FROM t1; --    16
+        SELECT count(*) FROM t1;
+      }
+    } {16}
+
+    do_execsql_test 2.4 {
+      PRAGMA wal_checkpoint;
+    } {0 24 24}
+    db2 close
+  }
 }
 
 reset_db
@@ -227,7 +229,7 @@ do_test 4.4 {
 do_execsql_test 4.5 { COMMIT }
 
 #-------------------------------------------------------------------------
-# Ensure that existing cursors holding xFetch() references are not 
+# Ensure that existing cursors holding xFetch() references are not
 # confused if those pages are moved to make way for the root page of a
 # new table or index.
 #
@@ -296,7 +298,7 @@ foreach {tn1 mmap1 mmap2} {
     sql1 "PRAGMA mmap_size = $mmap1"
     sql2 "PRAGMA mmap_size = $mmap2"
 
-    do_test $tn1.$tn { 
+    do_test $tn1.$tn {
       for {set i 1} {$i <= 100} {incr i} {
         if {$i % 2} {
           set c1 sql1
@@ -311,7 +313,7 @@ foreach {tn1 mmap1 mmap2} {
           UPDATE t2 SET x = (SELECT md5sum(a) FROM t1);
         }
 
-        set res [$c2 { 
+        set res [$c2 {
             SELECT count(*) FROM t1;
             SELECT x == (SELECT md5sum(a) FROM t1) FROM t2;
             PRAGMA integrity_check;