Make the test 'vtabH-3.1' work when there are less than 5 top-level items.

FossilOrigin-Name: 328f79bb5713abbecaeb0ef3fb37f56a0946b915

diff --git a/manifest b/manifest
index 6980de4b90efcd12783be8d700917f74e1bf3451..2992ea4ce20950cbc60d2da2ac7881e3dc8745fe 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Support\srunning\sthe\sfstree\stests\sin\s'vtabH.test'\son\sWindows\swhen\snot\susing\sthe\ssystem\sdrive.
-D 2016-08-26T01:17:12.349
+C Make\sthe\stest\s'vtabH-3.1'\swork\swhen\sthere\sare\sless\sthan\s5\stop-level\sitems.
+D 2016-08-26T01:47:22.955
 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 5017381e4853b1472e01d5bb926be1268eba429c
@@ -1347,7 +1347,7 @@ F test/vtabC.test 4528f459a13136f982e75614d120aef165f17292
 F test/vtabD.test 05b3f1d77117271671089e48719524b676842e96
 F test/vtabE.test d5024aa42754962f6bb0afd261681686488e7afe
 F test/vtabF.test 1918844c7c902f6a16c8dacf1ec8f84886d6e78b
-F test/vtabH.test c7a029dc54ee0e1f21f78c7a6c93a706703bea6d
+F test/vtabH.test e2d597b61f06e74b7ec0e6366f10eab6a6404cd8
 F test/vtabI.test 751b07636700dbdea328e4265b6077ccd6811a3f
 F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
 F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
@@ -1511,7 +1511,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 a8546feec9388d96934b16e516a165cd37d32ce9
-R 66d6b55dfecea97ee12f2bdebb86bb76
+P 3680f95ff34fdcf6a18a99268678a56e4be5a023
+R 43a3970ddbdab96e60099ba72556b24c
 U mistachkin
-Z 5d798dae32bcc32e75e6cc95a57c626f
+Z 62b5f3e99eda63df5de3a56bf43d82d6

diff --git a/manifest.uuid b/manifest.uuid
index 59101f59c693271422f4f2905359f80dc26a3b8f..a4ff000932f40a04125892eda6e3de078bfdb79c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3680f95ff34fdcf6a18a99268678a56e4be5a023
\ No newline at end of file
+328f79bb5713abbecaeb0ef3fb37f56a0946b915
\ No newline at end of file

diff --git a/test/vtabH.test b/test/vtabH.test
index 7e3ba41d644fdbea47d068656bc80239e450b1f7..d3f298e210e581a4857f44515bb8a41bd6a94ba9 100644 (file)
--- a/test/vtabH.test
+++ b/test/vtabH.test
@@ -152,16 +152,19 @@ if {$tcl_platform(platform)!="windows" || \
   # special files on some Windows platforms.
   #
   set res [list]
-  foreach p [lrange [list_root_files] 0 4] {
+  set root_files [list_root_files]
+  set num_root_files [llength $root_files]
+  set lim_root_files [expr {$num_root_files > 5 ? 5 : $num_root_files}]
+  foreach p [lrange $root_files 0 [expr {$lim_root_files - 1}]] {
     if {$::tcl_platform(platform) eq "windows"} {
       if {![regexp {\$} $p]} {lappend res $p}
     } else {
       lappend res "/$p"
     }
   }
-  do_execsql_test 3.1 {
-    SELECT path FROM fstree WHERE path NOT GLOB '*$*' LIMIT 5;
-  } $res
+  do_execsql_test 3.1 [subst {
+    SELECT path FROM fstree WHERE path NOT GLOB '*\$*' LIMIT $lim_root_files;
+  }] $res
 
   # Read all entries in the current directory.
   #