Fix some test files so that they work with SQLITE_OMIT_WAL builds.

FossilOrigin-Name: a38668dcff0a4d241d959ea19330ad43295d757d

diff --git a/manifest b/manifest
index 849b18969b66e1e500a5e15e9866da86cb48bb88..7890a96310fe8642c218ae1298cce867b9863c20 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sSQLITE_DBSTATUS_CACHE_HIT\sand\s_MISS\sto\sthe\s".stat"\scommand\sin\sthe\sshell.
-D 2011-09-23T18:58:23.501
+C Fix\ssome\stest\sfiles\sso\sthat\sthey\swork\swith\sSQLITE_OMIT_WAL\sbuilds.
+D 2011-09-24T05:55:36.123
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -276,7 +276,7 @@ F test/async5.test 0dd8701bd588bf6e70c2557a22ae3f22b2567b4c
 F test/attach.test 0e6f8de2589f11a5f474ef57fe5af2877e61c0e8
 F test/attach2.test e54436ed956d3d88bdee61221da59bf3935a0966
 F test/attach3.test d89ccfe4fe6e2b5e368d480fcdfe4b496c54cf4e
-F test/attach4.test 31f9eb0ca7bdbc393cc4657b877903a226a83d4b
+F test/attach4.test 53bf502f17647c6d6c5add46dda6bac8b6f4665c
 F test/attachmalloc.test 3a4bfca9545bfe906a8d2e622de10fbac5b711b0
 F test/auth.test b047105c32da7db70b842fd24056723125ecc2ff
 F test/auth2.test 270baddc8b9c273682760cffba6739d907bd2882
@@ -609,8 +609,8 @@ F test/notify3.test a86259abbfb923aa27d30f0fc038c88e5251488a
 F test/notnull.test cc7c78340328e6112a13c3e311a9ab3127114347
 F test/null.test a8b09b8ed87852742343b33441a9240022108993
 F test/openv2.test 0d3040974bf402e19b7df4b783e447289d7ab394
-F test/oserror.test 3fe52e0bd2891a9bf7cdeb639554992453d46301
-F test/pager1.test 2d3a7c6facd899d8879d23f31454cc53f49358b9
+F test/oserror.test 50417780d0e0d7cd23cf12a8277bb44024765df3
+F test/pager1.test c8f202a460ba6a1cd7a36888042ca471220bb42d
 F test/pager2.test 745b911dde3d1f24ae0870bd433dfa83d7c658c1
 F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
 F test/pagerfault.test 452f2cc23e3bfcfa935f4442aec1da4fe1dc0442
@@ -691,7 +691,7 @@ F test/subquery.test b524f57c9574b2c0347045b4510ef795d4686796
 F test/subquery2.test edcad5c118f0531c2e21bf16a09bbb105252d4cd
 F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
 F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
-F test/superlock.test 5d7a4954b0059c903f82c7b67867bc5451a7c082
+F test/superlock.test 7b1167925e9d30a5d1f0701d24812fdda42c3a86
 F test/sync.test a34cd43e98b7fb84eabbf38f7ed8f7349b3f3d85
 F test/syscall.test 966addf703faee6a5d509abe6d8885e393e552fd
 F test/sysfault.test c79441d88d23696fbec7b147dba98d42a04f523f
@@ -858,7 +858,7 @@ F test/unique.test 083c7fff74695bcc27a71d75699deba3595bc9c2
 F test/unixexcl.test 9d80a54d86d2261f660758928959368ffc36151e
 F test/unordered.test e81169ce2a8f31b2c6b66af691887e1376ab3ced
 F test/update.test 8bc86fd7ef1a00014f76dc6a6a7c974df4aef172
-F test/uri.test 53de9a2549cbda9c343223236918ef502f6a9051
+F test/uri.test 0d289d32396bdbc491e9dc845f1a52e13f861e0b
 F test/utf16align.test 54cd35a27c005a9b6e7815d887718780b6a462ae
 F test/vacuum.test 9516f3a8e49be666f2dde28561e4be5ae5612de0
 F test/vacuum2.test af432e6e3bfc0ea20a80cb86a03c7d9876d38324
@@ -894,7 +894,7 @@ F test/wal6.test 2e3bc767d9c2ce35c47106148d43fcbd072a93b3
 F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 F test/walbak.test b9f68e39646375c2b877be906babcc15d38b4877
-F test/walbig.test e882bc1d014afffbfa2b6ba36e0f07d30a633ad0
+F test/walbig.test 0ab8a430ef420a3114f7092e0f30fc9585ffa155
 F test/walcksum.test f5447800a157c9e2234fbb8e80243f0813941bde
 F test/walcrash.test 4fcb661faf71db91214156d52d43ee327f52bde1
 F test/walcrash2.test 019d60b89d96c1937adb2b30b850ac7e86e5a142
@@ -902,8 +902,8 @@ F test/walfault.test efb0d5724893133e71b8d9d90abdb781845a6bb0
 F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
-F test/walpersist.test 45fb0c94fb63908e2d66b1d99ce4645bfce0fa1e
-F test/walro.test 2d5d69e2e99da19ce6faab340330234fc4ca0720
+F test/walpersist.test fd40d33765b2693f721c90c66d97f99757559006
+F test/walro.test 412d0809300b94ba142440e94d6a30eabf2220b7
 F test/walshared.test 6dda2293880c300baf5d791c307f653094585761
 F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
 F test/walthread.test a2ed5270eb695284d4ad27d252517bdc3317ee2a
@@ -964,7 +964,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
-P 15a13b6c59ddf145c3fc860d993a7fa5587a0799
-R 8a846188b5a50b629e779a79335084c3
-U drh
-Z fb711bd276d7d1d753d686357da5cf42
+P d279e1a309909a0897b6082753a0fadb5066c31a
+R 1d47a8525f2f65e65f824b1ab6ac3952
+U dan
+Z 402b9c23e658ae7ef163736478b873db

diff --git a/manifest.uuid b/manifest.uuid
index 4db7cfdbe53bac5e677714f070f5dfe1e5eeb7a4..1798c846b245ad4fcb278e540878366e052c04f3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d279e1a309909a0897b6082753a0fadb5066c31a
\ No newline at end of file
+a38668dcff0a4d241d959ea19330ad43295d757d
\ No newline at end of file

diff --git a/test/attach4.test b/test/attach4.test
index f597f5d0358ed333061bda96e58f41bc0b45827c..77dd7e41154f4a0523ddd110fb50b26b4a8c65b9 100644 (file)
--- a/test/attach4.test
+++ b/test/attach4.test
@@ -75,10 +75,12 @@ set L [list]
 set S ""
 foreach {name f} $files {
   if {[permutation] == "journaltest"} {
-    lappend L delete
+    set mode delete
   } else {
-    lappend L wal
+    set mode wal
   }
+  ifcapable !wal { set mode delete }
+  lappend L $mode
   append S "
     PRAGMA $name.journal_mode = WAL;
     UPDATE $name.tbl SET x = '$name';

diff --git a/test/oserror.test b/test/oserror.test
index bdeb868425b562281380d3b7d4e1b8791743a838..40d2966bcca57409fdb25aeb58375261c9a4d6d3 100644 (file)
--- a/test/oserror.test
+++ b/test/oserror.test
@@ -97,23 +97,25 @@ do_re_test 1.4.2 { lindex $::log 0 } {^os_unix.c:\d*: \(\d+\) open\(.*test.db\)
 #--------------------------------------------------------------------------
 # Tests oserror-1.* test failures in the unlink() system call.
 #
-do_test 2.1.1 {
-  set ::log [list]
-  file mkdir test.db-wal
-  forcedelete test.db
-  list [catch {
-    sqlite3 dbh test.db
-    execsql { SELECT * FROM sqlite_master } dbh
-  } msg] $msg
-} {1 {disk I/O error}}
-
-do_re_test 2.1.2 { 
-  lindex $::log 0 
-} {^os_unix.c:\d+: \(\d+\) unlink\(.*test.db-wal\) - }
-do_test 2.1.3 { 
-  catch { dbh close }
-  forcedelete test.db-wal
-} {}
+ifcapable wal {
+  do_test 2.1.1 {
+    set ::log [list]
+    file mkdir test.db-wal
+    forcedelete test.db
+    list [catch {
+      sqlite3 dbh test.db
+      execsql { SELECT * FROM sqlite_master } dbh
+    } msg] $msg
+  } {1 {disk I/O error}}
+  
+  do_re_test 2.1.2 { 
+    lindex $::log 0 
+  } {^os_unix.c:\d+: \(\d+\) unlink\(.*test.db-wal\) - }
+  do_test 2.1.3 { 
+    catch { dbh close }
+    forcedelete test.db-wal
+  } {}
+}
   
 
 test_syscall reset

diff --git a/test/pager1.test b/test/pager1.test
index b9ba775addb8068c2a9d568986749ca2d71e023f..bed7d736cd5b75cd8828f795d30b808f0e73f610 100644 (file)
--- a/test/pager1.test
+++ b/test/pager1.test
@@ -1992,31 +1992,33 @@ ifcapable wal {
 #   pager1-22.1.*: is a no-op on a non-WAL db, and
 #   pager1-22.2.*: does not cause xSync calls with a synchronous=off db.
 #
-do_test pager1-22.1.1 {
-  faultsim_delete_and_reopen
-  execsql {
-    CREATE TABLE ko(c DEFAULT 'abc', b DEFAULT 'def');
-    INSERT INTO ko DEFAULT VALUES;
-  }
-  execsql { PRAGMA wal_checkpoint }
-} {0 -1 -1}
-do_test pager1-22.2.1 {
-  testvfs tv -default 1
-  tv filter xSync
-  tv script xSyncCb
-  proc xSyncCb {args} {incr ::synccount}
-  set ::synccount 0
-  sqlite3 db test.db
-  execsql {
-    PRAGMA synchronous = off;
-    PRAGMA journal_mode = WAL;
-    INSERT INTO ko DEFAULT VALUES;
-  }
-  execsql { PRAGMA wal_checkpoint }
-  set synccount
-} {0}
-db close
-tv delete
+ifcapable wal {
+  do_test pager1-22.1.1 {
+    faultsim_delete_and_reopen
+    execsql {
+      CREATE TABLE ko(c DEFAULT 'abc', b DEFAULT 'def');
+      INSERT INTO ko DEFAULT VALUES;
+    }
+    execsql { PRAGMA wal_checkpoint }
+  } {0 -1 -1}
+  do_test pager1-22.2.1 {
+    testvfs tv -default 1
+    tv filter xSync
+    tv script xSyncCb
+    proc xSyncCb {args} {incr ::synccount}
+    set ::synccount 0
+    sqlite3 db test.db
+    execsql {
+      PRAGMA synchronous = off;
+      PRAGMA journal_mode = WAL;
+      INSERT INTO ko DEFAULT VALUES;
+    }
+    execsql { PRAGMA wal_checkpoint }
+    set synccount
+  } {0}
+  db close
+  tv delete
+}
 
 #-------------------------------------------------------------------------
 # Tests for changing journal mode.

diff --git a/test/superlock.test b/test/superlock.test
index b12863f7ffd0a8361f4ce357566e79b4b3571383..8155d929ce0c0b51f9b94804df63f322355fe878 100644 (file)
--- a/test/superlock.test
+++ b/test/superlock.test
@@ -48,6 +48,11 @@ do_execsql_test 1.1 {
   PRAGMA journal_mode = DELETE;
 } {delete}
 
+ifcapable !wal {
+  finish_test
+  return
+}
+
 do_test 1.2 { sqlite3demo_superlock unlock test.db } {unlock}
 do_catchsql_test 1.3 { SELECT * FROM t1 } {1 {database is locked}}
 do_test 1.4 { unlock } {}

diff --git a/test/uri.test b/test/uri.test
index f361e92917faff5296a1174836d1be52a004d6af..90074d0d272890cab9a1bdde7ab37dd02bc98fea 100644 (file)
--- a/test/uri.test
+++ b/test/uri.test
@@ -219,44 +219,46 @@ do_test 4.3.2 {
 # set, where X is the file-name the method is called on. Calls to the above
 # methods using "tvfs2" set entries in the global T2 array.
 #
-testvfs tvfs1 
-tvfs1 filter {xOpen xDelete xAccess xFullPathname}
-tvfs1 script tvfs1_callback
-proc tvfs1_callback {method filename args} { 
-  set ::T1([file tail $filename]) 1 
-}
-testvfs tvfs2 
-tvfs2 filter {xOpen xDelete xAccess xFullPathname}
-tvfs2 script tvfs2_callback
-proc tvfs2_callback {method filename args} { 
-  set ::T2([file tail $filename]) 1 
-}
-
-catch {db close}
-eval forcedelete [glob test.db*]
-do_test 5.1.1 {
-  sqlite3 db file:test.db1?vfs=tvfs1
-  execsql {
-    ATTACH 'file:test.db2?vfs=tvfs2' AS aux;
-    PRAGMA main.journal_mode = PERSIST;
-    PRAGMA aux.journal_mode = PERSIST;
-    CREATE TABLE t1(a, b);
-    CREATE TABLE aux.t2(a, b);
-    PRAGMA main.journal_mode = WAL;
-    PRAGMA aux.journal_mode = WAL;
-    INSERT INTO t1 VALUES('x', 'y');
-    INSERT INTO t2 VALUES('x', 'y');
+ifcapable wal {
+  testvfs tvfs1 
+  tvfs1 filter {xOpen xDelete xAccess xFullPathname}
+  tvfs1 script tvfs1_callback
+  proc tvfs1_callback {method filename args} { 
+    set ::T1([file tail $filename]) 1 
   }
-  lsort [array names ::T1]
-} {test.db1 test.db1-journal test.db1-wal}
-
-do_test 5.1.2 {
-  lsort [array names ::T2]
-} {test.db2 test.db2-journal test.db2-wal}
-
-db close
-tvfs1 delete
-tvfs2 delete
+  testvfs tvfs2 
+  tvfs2 filter {xOpen xDelete xAccess xFullPathname}
+  tvfs2 script tvfs2_callback
+  proc tvfs2_callback {method filename args} { 
+    set ::T2([file tail $filename]) 1 
+  }
+  
+  catch {db close}
+  eval forcedelete [glob test.db*]
+  do_test 5.1.1 {
+    sqlite3 db file:test.db1?vfs=tvfs1
+    execsql {
+      ATTACH 'file:test.db2?vfs=tvfs2' AS aux;
+      PRAGMA main.journal_mode = PERSIST;
+      PRAGMA aux.journal_mode = PERSIST;
+      CREATE TABLE t1(a, b);
+      CREATE TABLE aux.t2(a, b);
+      PRAGMA main.journal_mode = WAL;
+      PRAGMA aux.journal_mode = WAL;
+      INSERT INTO t1 VALUES('x', 'y');
+      INSERT INTO t2 VALUES('x', 'y');
+    }
+    lsort [array names ::T1]
+  } {test.db1 test.db1-journal test.db1-wal}
+  
+  do_test 5.1.2 {
+    lsort [array names ::T2]
+  } {test.db2 test.db2-journal test.db2-wal}
+  db close
+  
+  tvfs1 delete
+  tvfs2 delete
+}
 
 #-------------------------------------------------------------------------
 # Check that only "" and "localhost" are acceptable as authorities.

diff --git a/test/walbig.test b/test/walbig.test
index 9ceb8ede6d58eac1c30e30e3ca197d4d049b3713..092db2381b405f996b72292bbf41f79a694d11e3 100644 (file)
--- a/test/walbig.test
+++ b/test/walbig.test
@@ -17,6 +17,11 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !wal {
+  finish_test
+  return
+}
+
 # Do not use a codec for this file, as the database is manipulated using
 # external methods (the [fake_big_file] and [hexio_write] commands).
 #

diff --git a/test/walpersist.test b/test/walpersist.test
index 3f8b0b8930c872237e8a55ac2c1eb21f1f7310d0..175dcbf89603e874fbcac092f5ce82c72cc6dc7a 100644 (file)
--- a/test/walpersist.test
+++ b/test/walpersist.test
@@ -17,6 +17,11 @@ source $testdir/tester.tcl
 source $testdir/lock_common.tcl
 set ::testprefix walpersist
 
+ifcapable !wal {
+  finish_test
+  return
+}
+
 do_test walpersist-1.0 {
   db eval {
     PRAGMA journal_mode=WAL;

diff --git a/test/walro.test b/test/walro.test
index 60bdce9e04611d28bb59a59bb4b171a0fb1b6ae9..a8c489a79246aacf46716e3fc6a00edfeddf281a 100644 (file)
--- a/test/walro.test
+++ b/test/walro.test
@@ -24,6 +24,13 @@ if {$::tcl_platform(platform) != "unix"} {
   return
 }
 
+# And only if the build is WAL-capable.
+#
+ifcapable !wal {
+  finish_test
+  return
+}
+
 do_multiclient_test tn {
   # Do not run tests with the connections in the same process.
   #