Improvements to the PATTERN option of the "testrunner.tcl joblist" command.

The pattern match is case insensitive and applies to the state and displaytype
in addition to displayname.

FossilOrigin-Name: 63a8f60f98115d4ee6e40de3ae775770aba76e19df6ddde68bccb7967b0200dc

diff --git a/manifest b/manifest
index 0803ac4932b6796ad98491035f46a75fe7abe125..a5433fd4b9f07cdcaf89aa7c252a224b02de8176 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Help\ssystems\sstill\susing\sTcl8.6\sto\scompile\stclsqlite.c\sby\schanging\sa\ntypedef\sinto\sa\s#define.
-D 2024-10-27T10:33:47.353
+C Improvements\sto\sthe\sPATTERN\soption\sof\sthe\s"testrunner.tcl\sjoblist"\scommand.\nThe\spattern\smatch\sis\scase\sinsensitive\sand\sapplies\sto\sthe\sstate\sand\sdisplaytype\nin\saddition\sto\sdisplayname.
+D 2024-10-27T10:48:06.296
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md b6e6c1baf38e4339bd3f1e0e5e5bfd0a9a93d133360691b2785c2d4b2f2dcec2
@@ -1736,7 +1736,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 7b44f1a9b9a2de8112695b908afc21dd9a68cd2d44e84b73f1b27b53492c0d59
-F test/testrunner.tcl bc1a8d21a1aa3a5cf7c4883cbee4b6748790fe960fad06ca5db74ec914bd6525 x
+F test/testrunner.tcl 4e764b0da245add9670d1010a69a3ac5474a5dfe15e1d3183294c23cca43ef13 x
 F test/testrunner_data.tcl ba4aeea28aa03cfa6fe7e57782ddecb7a7b91c3a0b3251583cb4f0ee002de6a6
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2237,8 +2237,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 6dfda7f5799f5a2448d3bd57fe9422de100bd8f4f9e53e97f73eeb85c3707b0f
-R acfe37f64308f303e7877171f580928d
+P 82ab8ff399aafa3a1faec9c85e9d6bdd26636f28f3ea22287999a868bb78db57
+R 0d75fc44cce96c36a84fecce905e5052
 U drh
-Z 48fd3c7997c1ca83de275f6cc35d4431
+Z 2356ac73b439e525952354a1e2e52d93
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 554a1a32701b4b3f6ac3534c919b6009b1916d88..85767773f84acd7e85f6260274097c754101d915 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-82ab8ff399aafa3a1faec9c85e9d6bdd26636f28f3ea22287999a868bb78db57
+63a8f60f98115d4ee6e40de3ae775770aba76e19df6ddde68bccb7967b0200dc

diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index 964465d9b2418b3d867e0e7f2dd5402f60e81eb7..09c9f8ac243cb0b4ef612d93c820bebeded2fa8d 100755 (executable)
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -663,7 +663,9 @@ if {[llength $argv]>=1
   set SQL {SELECT displaytype, displayname, state FROM jobs}
   if {$pattern!=""} {
     regsub -all {[^a-zA-Z0-9*.-/]} $pattern ? pattern
-    append SQL " WHERE displayname GLOB '*$pattern*'"
+    set pattern [string tolower $pattern]
+    append SQL \
+       " WHERE lower(concat(state,' ',displaytype,' ',displayname)) GLOB '*$pattern*'"
   }
   append SQL " ORDER BY starttime"