From: dan <dan@noemail.net>
Date: Tue, 29 May 2018 13:25:14 +0000 (+0000)
Subject: Do not run test file "resetdb.test" as part of permutation "inmemory_journal".
X-Git-Tag: version-3.24.0~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66e82b47d9f8d1f6fb15e6963d5206d3b4a08e2c;p=thirdparty%2Fsqlite.git

Do not run test file "resetdb.test" as part of permutation "inmemory_journal".

FossilOrigin-Name: 4921e5bae4c12c3413cc0b2e58766cf2ac117ad95f92fcd1c2457db6cfabb054
---

diff --git a/manifest b/manifest
index d8d1c3067c..d6690cdc1c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\srequire\sa\sstatement\sjournal\sin\scases\swhere\sREPLACE\sconflict\shandling\sis\nused\sto\sinsert\sa\ssingle\srow,\sso\slong\sas\sthe\sREPLACE\soperation\scannot\sfire\sany\ntriggers\sor\sforeign\skey\sactions.
-D 2018-05-28T18:29:46.779
+C Do\snot\srun\stest\sfile\s"resetdb.test"\sas\spart\sof\spermutation\s"inmemory_journal".
+D 2018-05-29T13:25:14.089
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
@@ -1172,7 +1172,7 @@ F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
 F test/regexp2.test 40e894223b3d6672655481493f1be12012f2b33c
 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
 F test/releasetest.tcl 5f15ab8056799e9a6e26a310d49236d2e774d6a30d0ec74601e18d4ce146b79c x
-F test/resetdb.test 7fda92e443233208ec5e1825b176a9df63fb5bf962248e08b76eb4296c630cdf
+F test/resetdb.test 002ea3e6c5a27900379242558af669749cba26ba22c02340136436c9f71a93e9
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
 F test/rollback.test 06680159bc6746d0f26276e339e3ae2f951c64812468308838e0a3362d911eaa
 F test/rollback2.test bc868d57899dc6972e2b4483faae0e03365a0556941474eec487ae21d8d38bb6
@@ -1729,7 +1729,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P ce99c7724460b9cf4ccaf7f6bc1a522b5c34d5ad0683d465f7926b10f31f7d05
-R 8ffa7011fa1f11633dceb1e52e841ee7
+P 469a62ca33081854e54f3af6d93ab5a350484b149c8c8c4ee8be0ae5418382d9
+R 6d5a2f28fee740df115b32cacf25c704
 U dan
-Z c5da18dad54c31d464c6bb7fad20207f
+Z f08e9fad8901a7bd23ea9bccc655ae15
diff --git a/manifest.uuid b/manifest.uuid
index dcf71259a0..9c6033cb06 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-469a62ca33081854e54f3af6d93ab5a350484b149c8c8c4ee8be0ae5418382d9
\ No newline at end of file
+4921e5bae4c12c3413cc0b2e58766cf2ac117ad95f92fcd1c2457db6cfabb054
\ No newline at end of file
diff --git a/test/resetdb.test b/test/resetdb.test
index 05e456a8d0..a1a37c63fa 100644
--- a/test/resetdb.test
+++ b/test/resetdb.test
@@ -20,6 +20,16 @@ ifcapable !vtab||!compound {
   return
 }
 
+# In the "inmemory_journal" permutation, each new connection executes 
+# "PRAGMA journal_mode = memory". This fails with SQLITE_BUSY if attempted
+# on a wal mode database with existing connections. For this and a few
+# other reasons, this test is not run as part of "inmemory_journal".
+#
+if {[permutation]=="inmemory_journal"} {
+  finish_test
+  return
+}
+
 # Create a sample database
 do_execsql_test 100 {
   PRAGMA page_size=4096;