Update some test cases to work with SQLITE_OMIT_VIRTUALTABLE and

DEFAULT_AUTOVACUUM builds.

FossilOrigin-Name: 4b68f424ca9b5d4b0e77065a4e60ec0f70dcce0d01053fd7a6b2ecae9d3a5967

diff --git a/manifest b/manifest
index d3e7c578b68b12e6f07ffb1da019d803050055df..48a0614763aa73b9649be6dedcd915f729cad977 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stest\sfile\smmapwarm.test.\sWith\stests\sfor\sthe\ssqlite3_mmap_warm()\sextension.
-D 2017-10-11T20:27:03.845
+C Update\ssome\stest\scases\sto\swork\swith\sSQLITE_OMIT_VIRTUALTABLE\sand\nDEFAULT_AUTOVACUUM\sbuilds.
+D 2017-10-12T11:13:34.180
 F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6033b51b6aea702ea059f6ab2d47b1d3cef648695f787247dd4fb395fe60673f
@@ -615,7 +615,7 @@ F test/bestindex5.test 412b42f8036b28d8b2f3534d89389ad946a4b1a65a12263f51936f742
 F test/between.test 34d375fb5ce1ae283ffe82b6b233e9f38e84fc6c
 F test/bigfile.test aa74f4e5db51c8e54a1d9de9fa65d01d1eb20b59
 F test/bigfile2.test 1b489a3a39ae90c7f027b79110d6b4e1dbc71bfc
-F test/bigmmap.test ed6058a7794be26865c94d5bb62e12cdc4f7f01562b3b04f13eb3cdc52783921
+F test/bigmmap.test abe819e6e1ac1db0c3bfe364ff58889d96e7896b2bbc8bdf1afc77cdeb7d7a9b
 F test/bigrow.test f0aeb7573dcb8caaafea76454be3ade29b7fc747
 F test/bigsort.test 8299fa9298f4f1e02fc7d2712e8b77d6cd60e5a2
 F test/bind.test 1e136709b306f7ed3192d349c2930d89df6ab621654ad6f1a72381d3fe76f483
@@ -1054,7 +1054,7 @@ F test/mmap2.test 9d6dd9ddb4ad2379f29cc78f38ce1e63ed418022
 F test/mmap3.test b3c297e78e6a8520aafcc1a8f140535594c9086e
 F test/mmap4.test 2e2b4e32555b58da15176e6fe750f17c9dcf7f93
 F test/mmapfault.test d4c9eff9cd8c2dc14bc43e71e042f175b0a26fe3
-F test/mmapwarm.test fea1c17c538afaf4cdc914ad2a3f9c9c34a5d00e9a5d6423ddb6083c91aed6ab
+F test/mmapwarm.test 2272005969cd17a910077bd5082f70bc1fefad9a875afec7fc9af483898ecaf3
 F test/multiplex.test dc0d67b66f84b484a83cb8bbdf3f0a7f49562ccd
 F test/multiplex2.test 580ca5817c7edbe4cc68fa150609c9473393003a
 F test/multiplex3.test d228f59eac91839a977eac19f21d053f03e4d101
@@ -1536,7 +1536,7 @@ F test/whereB.test 0def95db3bdec220a731c7e4bec5930327c1d8c5
 F test/whereC.test cae295158703cb3fc23bf1a108a9ab730efff0f6
 F test/whereD.test 711d4df58d6d4fb9b3f5ce040b818564198be002
 F test/whereE.test b3a055eef928c992b0a33198a7b8dc10eea5ad2f
-F test/whereF.test a44c7d73c22e2532a5c2dc7377fca64825f86a8969b113a1bdcffacbcbc14d39
+F test/whereF.test d44b58338fe5ddd7286023e9bedb255aa264a6c4d2168b49591b167371c675c7
 F test/whereG.test dde4c52a97385a55be6a7cd46be8373f0cf35501
 F test/whereH.test e4b07f7a3c2f5d31195cd33710054c78667573b2
 F test/whereI.test eab5b226bbc344ac70d7dc09b963a064860ae6d7
@@ -1657,7 +1657,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 0245adffc6f9b580217e0d2feb396d6895e54cdc25f5dfc9c8f4090b919e9e49
-R a1117ec420d64b4ef2d3498dc99fc25e
+P 5c4980ef17291dcea5e93ead353b9a95e2fbff56ff7257e9878d095f6827b4e9
+R b29f3e00752cf4173db0ec3aec606d66
 U dan
-Z 24c1dfd62587ab303e50a574dce24d2b
+Z bf0ac220dc2474d5d13a0301e1eb0593

diff --git a/manifest.uuid b/manifest.uuid
index c1604490912be25ebba5d8aa7cb5e61b2673df50..ba180b21c1c57f6e26d968061a830b5e7e932863 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5c4980ef17291dcea5e93ead353b9a95e2fbff56ff7257e9878d095f6827b4e9
\ No newline at end of file
+4b68f424ca9b5d4b0e77065a4e60ec0f70dcce0d01053fd7a6b2ecae9d3a5967
\ No newline at end of file

diff --git a/test/bigmmap.test b/test/bigmmap.test
index d44c487fc273ad85387cb9ea865ad4c6f7bfe947..9284bda37d8da4e31e2e6a9e68acc834e273151d 100644 (file)
--- a/test/bigmmap.test
+++ b/test/bigmmap.test
@@ -20,7 +20,7 @@ set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 set testprefix bigmmap
 
-ifcapable !mmap {
+ifcapable !mmap||!vtab {
   finish_test
   return
 }

diff --git a/test/mmapwarm.test b/test/mmapwarm.test
index 6072ab862426778639929acaa83cb5abd536edd2..b077047ebcd4d7b67b83a0f81870dddc7a5ba592 100644 (file)
--- a/test/mmapwarm.test
+++ b/test/mmapwarm.test
@@ -26,6 +26,7 @@ set testprefix mmapwarm
 
 
 do_execsql_test 1.0 {
+  PRAGMA auto_vacuum = 0;
   CREATE TABLE t1(x, y);
   WITH s(i) AS (
     SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<500

diff --git a/test/whereF.test b/test/whereF.test
index 0888f25789903e868ef308f76390c25643b1b9a0..8b272a5c53897ea98a216ceb8ac213a11aa77587 100644 (file)
--- a/test/whereF.test
+++ b/test/whereF.test
@@ -179,7 +179,7 @@ do_test 5.6 { expr [db status vmstep]<200 } 1
 # 2017-09-04 ticket b899b6042f97f52d
 # Segfault on correlated subquery...
 #
-ifcapable json1 {
+ifcapable json1&&vtab {
   do_execsql_test 6.1 {
     CREATE TABLE t6(x);
     SELECT * FROM t6 WHERE 1 IN (SELECT value FROM json_each(x));