From c595419910ece09e9d8af38bbc351531e63a193c Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Tue, 27 Dec 2016 02:43:47 +0000
Subject: [PATCH] Minor changes to make some newer test cases work under more
 compile-time options.

FossilOrigin-Name: 382eea36c56f866efee1321f643687a4061e8b9e
---
 manifest         | 16 ++++++++--------
 manifest.uuid    |  2 +-
 test/nockpt.test |  1 +
 test/shell1.test |  2 ++
 test/shell6.test |  3 +--
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/manifest b/manifest
index 2bd0f4f1da..a1a4c4b69e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C During\sfuzz\stesting\swith\sthe\sfuzzcheck\sutility\sprogram,\simpose\sa\srecord\nlength\slimit\sof\s100MB\sand\sa\slimit\son\sthe\slength\sof\sLIKE\sstrings\sof\s50\sbytes.
-D 2016-12-26T12:25:19.250
+C Minor\schanges\sto\smake\ssome\snewer\stest\scases\swork\sunder\smore\scompile-time\noptions.
+D 2016-12-27T02:43:47.038
 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -967,7 +967,7 @@ F test/multiplex4.test e8ae4c4bd70606a5727743241f13b5701990abe4
 F test/mutex1.test ea2cc74d97f077b9e74c84cbd024f14d79a8126f
 F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660
 F test/nan.test dacc57f80859c06a433d30839336fe227d2038b3
-F test/nockpt.test c65fc1c921d48805dcfca2dca5d1302839a5a1de
+F test/nockpt.test 1e5c87614d200585b4395286946cca5fc0930e3f
 F test/nolock.test f196cf8b8fbea4e2ca345140a2b3f3b0da45c76e
 F test/notify1.test 669b2b743618efdc18ca4b02f45423d5d2304abf
 F test/notify2.test 2ecabaa1305083856b7c39cf32816b612740c161
@@ -1090,12 +1090,12 @@ F test/sharedA.test 0cdf1a76dfa00e6beee66af5b534b1e8df2720f5
 F test/sharedB.test 16cc7178e20965d75278f410943109b77b2e645e
 F test/shared_err.test 2f2aee20db294b9924e81f6ccbe60f19e21e8506
 F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
-F test/shell1.test 8ff47a4821570b99cc340c4da0ac4efe2ba06627
+F test/shell1.test 52ac23a345772ab0d6d3241a21a633fdaa3ed581
 F test/shell2.test e242a9912f44f4c23c3d1d802a83e934e84c853b
 F test/shell3.test 9b95ba643eaa228376f06a898fb410ee9b6e57c1
 F test/shell4.test 89ad573879a745974ff2df20ff97c5d6ffffbd5d
 F test/shell5.test 50a732c1c2158b1cd62cf53975ce1ea7ce6b9dc9
-F test/shell6.test 87b47bf2f5c47a4e44f07dd119ea88ae303a8247
+F test/shell6.test cff624fadf71bdb5e3a9b0f86eaf59a43c0622b1
 F test/shell7.test 07751911b294698e0c5df67bcbd29e7d2f0f2907
 F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
 F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
@@ -1539,7 +1539,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 a37c00dcd192f9d610ecb91810ef57ef41d1f6a6
-R 96ba27febbb334158a799b41f6781b59
+P edc9db41f3ee200ba44579a46ed8331bbbbf539e
+R 96afac5b20dcc0117476250a7301f42d
 U drh
-Z 01474197bef46a6f383dfbedbe3b38a0
+Z 51bc03a9fcd5bae5965694035444d10d
diff --git a/manifest.uuid b/manifest.uuid
index 0d9073032e..9b729c87bb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-edc9db41f3ee200ba44579a46ed8331bbbbf539e
\ No newline at end of file
+382eea36c56f866efee1321f643687a4061e8b9e
\ No newline at end of file
diff --git a/test/nockpt.test b/test/nockpt.test
index cf350c3e1b..6ac434ed56 100644
--- a/test/nockpt.test
+++ b/test/nockpt.test
@@ -23,6 +23,7 @@ ifcapable !wal {finish_test ; return }
 set testprefix nockpt
 
 do_execsql_test 1.0 {
+  PRAGMA auto_vacuum=OFF;
   PRAGMA page_size = 1024;
   PRAGMA journal_mode = wal;
   CREATE TABLE c1(x, y, z);
diff --git a/test/shell1.test b/test/shell1.test
index 9400d75296..95c3130bdd 100644
--- a/test/shell1.test
+++ b/test/shell1.test
@@ -273,6 +273,7 @@ do_test shell1-3.2.4 {
   catchcmd "test.db" ".bail OFF BAD"
 } {1 {Usage: .bail on|off}}
 
+ifcapable vtab {
 # .databases             List names and files of attached databases
 do_test shell1-3.3.1 {
   catchcmd "-csv test.db" ".databases"
@@ -281,6 +282,7 @@ do_test shell1-3.3.2 {
   # extra arguments ignored
   catchcmd "test.db" ".databases BAD"
 } "/0.+main.+[string map {/ ".{1,2}"} [string range [get_pwd] 0 10]].*/"
+}
 
 # .dump ?TABLE? ...      Dump the database in an SQL text format
 #                          If TABLE specified, only dump tables matching
diff --git a/test/shell6.test b/test/shell6.test
index 028ac5efe9..a70c4b4298 100644
--- a/test/shell6.test
+++ b/test/shell6.test
@@ -14,6 +14,7 @@
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
+ifcapable !vtab {finish_test; return}
 set testprefix shell6
 set CLI [test_find_cli]
 db close
@@ -98,5 +99,3 @@ foreach {tn schema output} {
 }
 
 finish_test
-
-