Fix autoinc.test and resetdb.test so that they work with all permutations.

FossilOrigin-Name: 89f56d6b0a6847b042a1556cdf79c598c9bfdbdd5f9529d508ca7b4d26a6ed38

diff --git a/manifest b/manifest
index ea6efd4e494432cac9c3d09d10358894ce081a65..d57412c1153b26cf0b6a908b4ee8c44d537a62be 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\scomment\sto\sjustify\sa\sgoto\sstatement.\s\sNo\scode\schanges.
-D 2018-05-29T15:18:31.786
+C Fix\sautoinc.test\sand\sresetdb.test\sso\sthat\sthey\swork\swith\sall\spermutations.
+D 2018-05-29T16:37:12.553
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
@@ -626,7 +626,7 @@ F test/auth.test 3d6cd8f3978ba55b1202574e6ecd79c6e00914ca44b9bfd6c1fe6fb873fcac8
 F test/auth2.test 9eb7fce9f34bf1f50d3f366fb3e606be5a2000a1
 F test/auth3.test db21405b95257c24d29273b6b31d0efc59e1d337e3d5804ba2d1fd4897b1ae49
 F test/autoanalyze1.test b9cc3f32a990fa56669b668d237c6d53e983554ae80c0604992e18869a0b2dec
-F test/autoinc.test 5ecd36e08e44478a3cf91114ff58999234d67cc37f6e86c66a137535071aee1c
+F test/autoinc.test 9d202b7dce6571e52b744138eff12610214501acd635abdd72d18736cd06fd22
 F test/autoindex1.test a09958fa756129af10b6582bcbf3cbdf11e305e027b393f393caef801159dee0
 F test/autoindex2.test 12ef578928102baaa0dc23ad397601a2f4ecb0df
 F test/autoindex3.test 2dd997d6590438b53e4f715f9278aa91c9299cf3f81246a0915269c35beb790e
@@ -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 9a53704aa5f241ca3afcbc452da51439c263096bc22833afd31f40c17d3fb8c4
+F test/resetdb.test 5de55c345c36f3b5abc959f89bce48ea32ee13a6d3c1950259e33ad471a44302
 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 ce9b756f09df4feb485bbf9695f8c6774906eb1b2fb45a340b74ffd21c9adfd8
-R 82f5332723d052db6b67dcf39d502cbe
-U drh
-Z 5b08097ca2ebe2e0a594d1d1fc74ef07
+P f141d806476aabe592a15d83b72c9409d2cd6bd7f9cced1ea2513c134191430a
+R 24eea3cbea5ec58ea3aad36c526601c6
+U dan
+Z f5a308ad8bc137c4299b8f7a0fab4e7b

diff --git a/manifest.uuid b/manifest.uuid
index 599d1aa03e1d58aaa6e8c87cbc31469703a6c260..f157c969c36504f0c8c70465b0134cd03530d4e2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f141d806476aabe592a15d83b72c9409d2cd6bd7f9cced1ea2513c134191430a
\ No newline at end of file
+89f56d6b0a6847b042a1556cdf79c598c9bfdbdd5f9529d508ca7b4d26a6ed38
\ No newline at end of file

diff --git a/test/autoinc.test b/test/autoinc.test
index 83f3fa4210ef91fcde7ff180454c2bfe97a916e3..75b16daa102c87cf2f6bd4242640ab28d12ff599 100644 (file)
--- a/test/autoinc.test
+++ b/test/autoinc.test
@@ -25,6 +25,11 @@ ifcapable {!autoinc} {
   return
 }
 
+if {[permutation]=="inmemory_journal"} {
+  finish_test
+  return
+}
+
 sqlite3_db_config_lookaside db 0 0 0
 
 # The database is initially empty.

diff --git a/test/resetdb.test b/test/resetdb.test
index dd6a1a6726dcb090e0ca913f30ce45fa92c11a34..94052678d657b5d45ecf1d4e9944b92c11094f0f 100644 (file)
--- a/test/resetdb.test
+++ b/test/resetdb.test
@@ -25,7 +25,11 @@ ifcapable !vtab||!compound {
 # 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"} {
+# Permutation "journaltest" does not support wal mode.
+#
+if {[permutation]=="inmemory_journal"
+ || [permutation]=="journaltest"
+} {
   finish_test
   return
 }
@@ -130,6 +134,8 @@ do_test 330 {
   } db2
 } {1 {file is not a database}}
 
+db2 cache flush         ;# Required by permutation "prepare".
+
 # Reset the database yet again.  Verify that the page size and
 # journal mode are preserved.
 #