Merge tag 'upstream/2.2.1'

Upstream version 2.2.1
# gpg: Signature made Tue 13 Aug 2013 03:42:56 PM EDT using RSA key ID 374BBE81
# gpg: Good signature from "Hans-Christoph Steiner <hans@at.or.at>"
# gpg:                 aka "[jpeg image of size 5408]"
# gpg:                 aka "Hans-Christoph Steiner <hs420@nyu.edu>"
# gpg:                 aka "Hans-Christoph Steiner <hans@eds.org>"
# gpg:                 aka "Hans-Christoph Steiner <hans@guardianproject.info>"
# gpg:                 aka "Hans-Christoph Steiner <hansi@nyu.edu>"
# gpg:                 aka "Hans-Christoph Steiner <hans@guardianproject.info>"

1 files changed, 29 insertions, 27 deletions

diff --git a/test/zerodamage.test b/test/zerodamage.test
index 3d18c8d..de5088b 100644
--- a/test/zerodamage.test
+++ b/test/zerodamage.test
@@ -18,7 +18,7 @@
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
-set testprefix wal5
+set testprefix zerodamage
 
 ifcapable !vtab {
   finish_test
@@ -59,7 +59,7 @@ do_test zerodamage-2.0 {
   }
   tv filter xDelete
   tv script xDeleteCallback
-  register_wholenumber_module db
+  load_static_extension db wholenumber
   db eval {
     PRAGMA page_size=1024;
     PRAGMA journal_mode=DELETE;
@@ -89,31 +89,33 @@ do_test zerodamage-2.1 {
   concat [file_control_powersafe_overwrite db -1] [set ::max_journal_size]
 } {0 0 24704}
 
-# Run a WAL-mode transaction with POWERSAFE_OVERWRITE on to verify that the
-# WAL file does not get too big.
-#
-do_test zerodamage-3.0 {
-  db eval {
-     PRAGMA journal_mode=WAL;
-  }
-  db close
-  sqlite3 db file:test.db?psow=TRUE -uri 1
-  db eval {
-     UPDATE t1 SET y=randomblob(50) WHERE x=124;
-  }
-  file size test.db-wal
-} {1080}
+ifcapable wal {
+  # Run a WAL-mode transaction with POWERSAFE_OVERWRITE on to verify that the
+  # WAL file does not get too big.
+  #
+  do_test zerodamage-3.0 {
+    db eval {
+       PRAGMA journal_mode=WAL;
+    }
+    db close
+    sqlite3 db file:test.db?psow=TRUE -uri 1
+    db eval {
+       UPDATE t1 SET y=randomblob(50) WHERE x=124;
+    }
+    file size test.db-wal
+  } {1080}
 
-# Repeat the previous with POWERSAFE_OVERWRITE off.  Verify that the WAL file
-# is padded.
-#
-do_test zerodamage-3.1 {
-  db close
-  sqlite3 db file:test.db?psow=FALSE -uri 1
-  db eval {
-     UPDATE t1 SET y=randomblob(50) WHERE x=124;
-  }
-  file size test.db-wal
-} {8416}
+  # Repeat the previous with POWERSAFE_OVERWRITE off.  Verify that the WAL file
+  # is padded.
+  #
+  do_test zerodamage-3.1 {
+    db close
+    sqlite3 db file:test.db?psow=FALSE -uri 1
+    db eval {
+       UPDATE t1 SET y=randomblob(50) WHERE x=124;
+    }
+    file size test.db-wal
+  } {8416}
+}
 
 finish_test