Fix minor test script problems revealed by releasetest.tcl.

FossilOrigin-Name: 15e87d9bc81812fb9de86f9870389217dddb9f9c4d48e42acefce2d35ba293f1

diff --git a/manifest b/manifest
index 68f0dd8fc969e5bb41c4b5d2e27fbb0b69828993..994305976a552fe97aacee349f497fa24143ea5e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stest\scases\sin\sdbpage.test\sso\sthat\sthey\swork\swith\nSQLITE_DEFAULT_AUTOVACUUM=1\sbuilds.
-D 2017-10-22T08:02:56.288
+C Fix\sminor\stest\sscript\sproblems\srevealed\sby\sreleasetest.tcl.
+D 2017-10-23T07:52:07.660
 F Makefile.in e016061b23e60ac9ec27c65cb577292b6bde0307ca55abd874ab3487b3b1beb2
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 37740aba9c4bb359c627eadccf1cfd7be4f5f847078723777ea7763969e533b1
@@ -690,7 +690,7 @@ F test/corruptG.test adf79b669cbfd19e28c8191a610d083ae53a6d51
 F test/corruptH.test 79801d97ec5c2f9f3c87739aa1ec2eb786f96454
 F test/corruptI.test 075fe1d75aa1d84e2949be56b6264376c41502e4
 F test/corruptJ.test 4d5ccc4bf959464229a836d60142831ef76a5aa4
-F test/corruptK.test d93f5797bf0555a47dcc81bc9727cb72fa7c8ac348c25f42937573cd29bb3850
+F test/corruptK.test 91550557849244a9904f4e090052e3f2c1c3f1106840d58b00ffaa3a8c2d3fc0
 F test/cost.test 1eedbfd868f806f3fa08ff072b04cf270dcf61c8
 F test/count.test cb2e0f934c6eb33670044520748d2ecccd46259c
 F test/coveridxscan.test b629e896b14df2f000a99b8d170d80589c46562c
@@ -713,7 +713,7 @@ F test/cursorhint2.test 8457e93d97f665f23f97cdbc8477d16e3480331b
 F test/date.test 9b73bbeb1b82d9c1f44dec5cf563bf7da58d2373
 F test/date2.test 74c234bece1b016e94dd4ef9c8cc7a199a8806c0e2291cab7ba64bace6350b10
 F test/dbfuzz.c 73047c920d6210e5912c87cdffd9a1c281d4252e
-F test/dbpage.test a9e7774416f5f2fb237601628804b339f897112edb9ba92f7675a61e3e9c6244
+F test/dbpage.test 10b9e91d07b0892444fff4578706648e955b5fb260218298f838da74f0d9d211
 F test/dbstatus.test 73149851b3aff14fc6db478e58f9083a66422cf5
 F test/dbstatus2.test e93ab03bfae6d62d4d935f20de928c19ca0ed0ab
 F test/default.test 0cb49b1c315a0d81c81d775e407f66906a2a604d
@@ -1664,7 +1664,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 7bd20a20a0f422765a6e469d1a1b67b95c4a441931688e04a2b1b491a5238528
-R 6416cb828bdd2d9e1b57b650566d1c6c
+P 0fcf1e61ef2b6c1fb8f4846f973d2d427598ffbc80dbc49e56e71513b194bae7
+R e3bec412c3fcc940b80e7c9735d18bbe
 U dan
-Z 9dddfd6ebe074eda07e6c2b88ec3bea0
+Z a4aaac778f287d83315a30f9e1092784

diff --git a/manifest.uuid b/manifest.uuid
index e9c39dc6ef56a26dd75ebfcef86cfebcea7ef591..be55c08755bf140a5214b023701f84bb0dc6aa5b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0fcf1e61ef2b6c1fb8f4846f973d2d427598ffbc80dbc49e56e71513b194bae7
\ No newline at end of file
+15e87d9bc81812fb9de86f9870389217dddb9f9c4d48e42acefce2d35ba293f1
\ No newline at end of file

diff --git a/test/corruptK.test b/test/corruptK.test
index 05465a9b5fbc9c493a94356f7615c6f9cef895c5..1694db17475817abf3da513837250e070206eadf 100644 (file)
--- a/test/corruptK.test
+++ b/test/corruptK.test
@@ -110,6 +110,7 @@ do_catchsql_test 2.3 {
 #-------------------------------------------------------------------------
 
 ifcapable vtab {
+if {[permutation]!="inmemory_journal"} {
 
   proc hex2blob {hex} {
     # Split on newlines:
@@ -219,6 +220,7 @@ ifcapable vtab {
     PRAGMA integrity_check;
   } {1 {database disk image is malformed}}
 
+} ;# [permutation]!="inmemory_journal"
 } ;# ifcapable vtab
 
 

diff --git a/test/dbpage.test b/test/dbpage.test
index e4389a3b9091375297b8199d45b7f20a82aff4be..a8ef8c0800bd8ecd71799398ae718dda0acd94cc 100644 (file)
--- a/test/dbpage.test
+++ b/test/dbpage.test
@@ -21,15 +21,19 @@ ifcapable !vtab||!compound {
   return
 }
 
-do_execsql_test 100 {
-  PRAGMA auto_vacuum=0;
-  PRAGMA page_size=4096;
-  PRAGMA journal_mode=WAL;
-  CREATE TABLE t1(a,b);
-  WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM c WHERE x<100)
-  INSERT INTO t1(a,b) SELECT x, printf('%d-x%.*c',x,x,'x') FROM c;
-  PRAGMA integrity_check;
-} {wal ok}
+do_test 100 {
+  execsql {
+    PRAGMA auto_vacuum=0;
+    PRAGMA page_size=4096;
+    PRAGMA journal_mode=WAL;
+  }
+  execsql { 
+    CREATE TABLE t1(a,b);
+    WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM c WHERE x<100)
+      INSERT INTO t1(a,b) SELECT x, printf('%d-x%.*c',x,x,'x') FROM c;
+    PRAGMA integrity_check;
+  }
+} {ok}
 do_execsql_test 110 {
   SELECT pgno, quote(substr(data,1,5)) FROM sqlite_dbpage('main') ORDER BY pgno;
 } {1 X'53514C6974' 2 X'0500000001' 3 X'0D0000004E' 4 X'0D00000016'}