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, 31 insertions, 1 deletions

diff --git a/test/sysfault.test b/test/sysfault.test
index 07d525c..92fb534 100644
--- a/test/sysfault.test
+++ b/test/sysfault.test
@@ -243,5 +243,35 @@ do_faultsim_test 3 -faults vfsfault-* -prep {
   faultsim_test_result {0 20000}
 }
 
-finish_test
+#-------------------------------------------------------------------------
+# Test errors in mmap().
+#
+proc vfsfault_install {} { 
+  test_syscall reset
+  test_syscall install {mmap}
+}
+
+faultsim_delete_and_reopen
+execsql {
+  CREATE TABLE t1(a, b);
+  INSERT INTO t1 VALUES(1, 2);
+}
+faultsim_save_and_close
+
+do_faultsim_test 4 -faults vfsfault-* -prep {
+  faultsim_restore_and_reopen
+  file_control_chunksize_test db main 8192
+  execsql { 
+    PRAGMA mmap_size = 1000000;
+  }
+} -body {
+  test_syscall errno mmap     EACCES
+
+  execsql {
+    SELECT * FROM t1;
+  }
+} -test {
+  faultsim_test_result {0 {1 2}} {1 {disk I/O error}}
+}
 
+finish_test