From: drh <drh@noemail.net>
Date: Mon, 5 Jun 2017 10:31:03 +0000 (+0000)
Subject: Omit some of the fstree tests in vtabH if the PWD contains LIKE wildcards.
X-Git-Tag: version-3.20.0~215
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b77506ba55ec1efede03fbd5ed4563eb1da4594;p=thirdparty%2Fsqlite.git

Omit some of the fstree tests in vtabH if the PWD contains LIKE wildcards.

FossilOrigin-Name: ead29f9cb757a5f9921086e3bb4998f60e0d6cfcf41ef0f9a230b365b6226947
---

diff --git a/manifest b/manifest
index e7b7904567..fa86dc3059 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Initialize\sa\svariable\sto\szero\sto\sprevent\san\s(incorrect)\scompiler\swarning\sof\nit\spotentially\sbeing\suninitialized.
-D 2017-06-03T20:09:37.750
+C Omit\ssome\sof\sthe\sfstree\stests\sin\svtabH\sif\sthe\sPWD\scontains\sLIKE\swildcards.
+D 2017-06-05T10:31:03.284
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
@@ -1416,7 +1416,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 5f9253eb9e41ba9fe94f4aa3e9230191893d7764
+F test/vtabH.test 26d54e8b5407f797638b787a55f9c88323850a58dd142de02d06b9a1159bd283
 F test/vtabI.test 751b07636700dbdea328e4265b6077ccd6811a3f
 F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
 F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
@@ -1582,7 +1582,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 c4089ffbdb4b3467648c97044b0d3085da7128103079b686f608efde83c7df30
-R 3c37ab99d269368a12ed5d8ba45b9047
+P 65182ce041b30cd0193b958eca975b720fe5200a868baba1e633e49433d86813
+R 2c9842dfb62b82356e8a96cc9ba71901
 U drh
-Z e34770b44d77a197b518fca205f97903
+Z 6bfb0810488624ef037a9b068fe5d2de
diff --git a/manifest.uuid b/manifest.uuid
index f2abf0bf6c..de082373de 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-65182ce041b30cd0193b958eca975b720fe5200a868baba1e633e49433d86813
\ No newline at end of file
+ead29f9cb757a5f9921086e3bb4998f60e0d6cfcf41ef0f9a230b365b6226947
\ No newline at end of file
diff --git a/test/vtabH.test b/test/vtabH.test
index c5684ff516..2ebc3f9cc3 100644
--- a/test/vtabH.test
+++ b/test/vtabH.test
@@ -216,24 +216,28 @@ if {$tcl_platform(platform)!="windows" || \
   } {}
 
   set pwd [pwd]
-  do_execsql_test 3.5 {
-    SELECT path, size FROM fstree WHERE path GLOB $pwd || '/subdir/*' ORDER BY 1
-  } [list \
-    "$pwd/subdir/x1.txt" 143 \
-    "$pwd/subdir/x2.txt" 153 \
-  ]
-  do_execsql_test 3.6 {
-    SELECT path, size FROM fstree WHERE path LIKE $pwd || '/subdir/%' ORDER BY 1
-  } [list \
-    "$pwd/subdir/x1.txt" 143 \
-    "$pwd/subdir/x2.txt" 153 \
-  ]
-  do_execsql_test 3.7 {
-    SELECT sum(size) FROM fstree WHERE path LIKE $pwd || '/subdir/%'
-  } 296
-  do_execsql_test 3.8 {
-    SELECT size FROM fstree WHERE path = $pwd || '/subdir/x1.txt'
-  } 143
+  if {![string match {*[_%]*} $pwd]} {
+    do_execsql_test 3.5 {
+      SELECT path, size FROM fstree 
+       WHERE path GLOB $pwd || '/subdir/*' ORDER BY 1
+    } [list \
+      "$pwd/subdir/x1.txt" 143 \
+      "$pwd/subdir/x2.txt" 153 \
+    ]
+    do_execsql_test 3.6 {
+      SELECT path, size FROM fstree
+       WHERE path LIKE $pwd || '/subdir/%' ORDER BY 1
+    } [list \
+      "$pwd/subdir/x1.txt" 143 \
+      "$pwd/subdir/x2.txt" 153 \
+    ]
+    do_execsql_test 3.7 {
+      SELECT sum(size) FROM fstree WHERE path LIKE $pwd || '/subdir/%'
+    } 296
+    do_execsql_test 3.8 {
+      SELECT size FROM fstree WHERE path = $pwd || '/subdir/x1.txt'
+    } 143
+  }
 
 }