More minor changes to test scripts.

FossilOrigin-Name: ce9b756f09df4feb485bbf9695f8c6774906eb1b2fb45a340b74ffd21c9adfd8

diff --git a/ext/expert/expert1.test b/ext/expert/expert1.test
index 6db6944083cc387e9a5aeb6d5fbcdd2466acb39c..d1564c513f7f3b2fd630f75fc573da80551296c9 100644 (file)
--- a/ext/expert/expert1.test
+++ b/ext/expert/expert1.test
@@ -286,7 +286,6 @@ do_setup_rec_test $tn.14 {
   INSERT INTO t9 VALUES(?, ?, ?);
 } {
   CREATE INDEX t10_idx_00000062 ON t10(b); 
-  -- TRIGGER t9t
   SEARCH TABLE t10 USING INDEX t10_idx_00000062 (b=?)
 }
 

diff --git a/ext/expert/sqlite3expert.c b/ext/expert/sqlite3expert.c
index bd7220437a5e172694f665334501be21bdbb3068..695aaece8c919f50c3c9b886b66c6e0f29f35963 100644 (file)
--- a/ext/expert/sqlite3expert.c
+++ b/ext/expert/sqlite3expert.c
@@ -1152,7 +1152,9 @@ int idxFindIndexes(
         }
       }
 
-      pStmt->zEQP = idxAppendText(&rc, pStmt->zEQP, "%s\n", zDetail);
+      if( zDetail[0]!='-' ){
+        pStmt->zEQP = idxAppendText(&rc, pStmt->zEQP, "%s\n", zDetail);
+      }
     }
 
     for(pEntry=hIdx.pFirst; pEntry; pEntry=pEntry->pNext){

diff --git a/manifest b/manifest
index 6ca224e2d1846139d10b58efec4c80b81f4bf159..97cdf3f80ed5dc5b4718da465b9e91024e4a1f14 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\ssome\stest\sscript\sissues\scaused\sby\srecent\sEXPLAIN\sQUERY\sPLAN\senhancements.
-D 2018-05-29T14:06:55.574
+C More\sminor\schanges\sto\stest\sscripts.
+D 2018-05-29T14:29:28.684
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
@@ -44,8 +44,8 @@ F ext/async/sqlite3async.c 0f3070cc3f5ede78f2b9361fb3b629ce200d7d74
 F ext/async/sqlite3async.h f489b080af7e72aec0e1ee6f1d98ab6cf2e4dcef
 F ext/expert/README.md b321c2762bb93c18ea102d5a5f7753a4b8bac646cb392b3b437f633caf2020c3
 F ext/expert/expert.c d548d603a4cc9e61f446cc179c120c6713511c413f82a4a32b1e1e69d3f086a4
-F ext/expert/expert1.test 87e54effda905d991edfe4bcd28098460a568246129ab7263f71b25420ea727f
-F ext/expert/sqlite3expert.c 95fdee74be2912d962951d984f1123e55d3f44bd643da7a48ff6ea9426a47f69
+F ext/expert/expert1.test baa05800dc1c569faa7ce6232cead0fcedc07fea038b3a2489eaaf710831d546
+F ext/expert/sqlite3expert.c 89b7b59be610b929958db02416539a46ac088fd84f81623c4190aff62e92c3c4
 F ext/expert/sqlite3expert.h af6354f8ee5c9e025024e63fec3bd640a802afcc3099a44d804752cf0791d811
 F ext/expert/test_expert.c d56c194b769bdc90cf829a14c9ecbc1edca9c850b837a4d0b13be14095c32a72
 F ext/fts1/README.txt 20ac73b006a70bcfd80069bdaf59214b6cf1db5e
@@ -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 002ea3e6c5a27900379242558af669749cba26ba22c02340136436c9f71a93e9
+F test/resetdb.test 9a53704aa5f241ca3afcbc452da51439c263096bc22833afd31f40c17d3fb8c4
 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 4921e5bae4c12c3413cc0b2e58766cf2ac117ad95f92fcd1c2457db6cfabb054
-R ecb10fb0f9635ad295241cdcd77a742e
+P f808e22831c33bfe3d0dd44e209f64d527c23ca7c72be7c694736535afee1317
+R a950bde8e8845bee50be21d26f706a63
 U dan
-Z 6a01059d775358f21b5e5396e63246ac
+Z 13a937ec34327d3e0185a141b78b08f1

diff --git a/manifest.uuid b/manifest.uuid
index 09fe15369141c7420a3b81b4d089c3cb3664be33..57c59ca56e70459542811948be19371bffeaebcd 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f808e22831c33bfe3d0dd44e209f64d527c23ca7c72be7c694736535afee1317
\ No newline at end of file
+ce9b756f09df4feb485bbf9695f8c6774906eb1b2fb45a340b74ffd21c9adfd8
\ No newline at end of file

diff --git a/test/resetdb.test b/test/resetdb.test
index a1a37c63fa64ecb80d6468e804bdfb5066dedaea..dd6a1a6726dcb090e0ca913f30ce45fa92c11a34 100644 (file)
--- a/test/resetdb.test
+++ b/test/resetdb.test
@@ -32,6 +32,7 @@ if {[permutation]=="inmemory_journal"} {
 
 # Create a sample database
 do_execsql_test 100 {
+  PRAGMA auto_vacuum = 0;
   PRAGMA page_size=4096;
   CREATE TABLE t1(a,b);
   WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM c WHERE x<20)
@@ -92,6 +93,7 @@ db2 close
 forcedelete test.db
 sqlite3 db test.db
 do_execsql_test 300 {
+  PRAGMA auto_vacuum = 0;
   PRAGMA page_size=8192;
   PRAGMA journal_mode=WAL;
   CREATE TABLE t1(a,b);