Update testrunner.tcl so that the new option is --cases rather than singular

--case, and so that it is a glob pattern.

FossilOrigin-Name: 9488b4f00c9278de8c03f4a3cbd4f54e48e71c1eff45de4454f8bd49c080a930

diff --git a/manifest b/manifest
index 3184c26aaddedde07d0814daca0a5054920bfb97..2f066056991361048d44dd6e7a1cefc97b2517fe 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stypo\sin\sthe\s"testprefix"\sfor\swalckptnoop.test
-D 2025-10-06T16:23:31.511
+C Update\stestrunner.tcl\sso\sthat\sthe\snew\soption\sis\s--cases\srather\sthan\ssingular\n--case,\sand\sso\sthat\sit\sis\sa\sglob\spattern.
+D 2025-10-06T16:50:37.011
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -1690,7 +1690,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 463ae33b8bf75ac77451df19bd65e7c415c2e9891227c7c9e657d0a2d8e1074a
-F test/testrunner.tcl 66d14fc27a154de22c214a9db4b7dcab6aed2b4d84972ffce760d470b8191b7d x
+F test/testrunner.tcl 3534413457f0886b5234bbb2bb897b13520f8361131d1f5c9af884fdbc0b21e6 x
 F test/testrunner_data.tcl c507a9afa911c03446ed90442ffd4a98aca02882c3d51bd1177c24795674def8
 F test/testrunner_estwork.tcl 7927a84327259a32854926f68a75292e33a61e7e052fdbfcb01f18696c99c724
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
@@ -2168,8 +2168,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 8ea2e097b731514c284f255f12b08e15f63c7f49641a698e61ee7e47cc9d3c45
-R 75c8a149a031bb9c67e5255eee4254ac
+P ff205f29934417e8150b5243245fb70389717b219e35bd8d60791a8485b69b33
+R 686c4b13eb48b58cdb29870a249dd5ee
 U drh
-Z 524f4550b908fd8edfb1f78307bb0eb2
+Z 7f7d64b45be4de10b7d6ec47deaef59e
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.tags b/manifest.tags
index bec971799ff1b8ee641c166c7aeb22d12c785393..6d1bc39baebf45c7e66ec61be7e08ead65dd5a98 100644 (file)
--- a/manifest.tags
+++ b/manifest.tags
@@ -1,2 +1,2 @@
-branch trunk
-tag trunk
+branch testrunner-enhancements
+tag testrunner-enhancements

diff --git a/manifest.uuid b/manifest.uuid
index ad15a2443952e775bdebb1764cd3953b450f8c75..6a8d8076cfedb8cfd655d91315ffbe77840a012d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ff205f29934417e8150b5243245fb70389717b219e35bd8d60791a8485b69b33
+9488b4f00c9278de8c03f4a3cbd4f54e48e71c1eff45de4454f8bd49c080a930

diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index d933aba51eeda0b2422fc6e5ccf50e96c1edbede..af3a5a680f15c9567f336e8717ff09c330baa4cd 100755 (executable)
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -108,7 +108,7 @@ Usage:
 
   where SWITCHES are:
     --buildonly              Build test exes but do not run tests
-    --case DISPLAYNAME       Only run the one test identified by DISPLAYNAME
+    --cases DISPLAYNAME      Only run test that match DISPLAYNAME
     --config CONFIGS         Only use configs on comma-separate list CONFIGS
     --dryrun                 Write what would have happened to testrunner.log
     --explain                Write summary to stdout
@@ -240,7 +240,7 @@ set TRG(explain) 0                  ;# True for the --explain option
 set TRG(stopOnError) 0              ;# Stop running at first failure
 set TRG(stopOnCore) 0               ;# Stop on a core-dump
 set TRG(fullstatus) 0               ;# Full "status" report while running
-set TRG(case) {}                    ;# Only run this one case
+set TRG(case) {}                    ;# Only run cases matching this GLOB pattern
 
 switch -nocase -glob -- $tcl_platform(os) {
   *darwin* {
@@ -872,13 +872,13 @@ for {set ii 0} {$ii < [llength $argv]} {incr ii} {
       set TRG(dryrun) 1
     } elseif {($n>2 && [string match "$a*" --explain]) || $a=="-e"} {
       set TRG(explain) 1
-    } elseif {($n>2 && [string match "$a*" --omit]) || $a=="-c"} {
+    } elseif {$n>2 && [string match "$a*" --omit]} {
       incr ii
       set TRG(omitconfig) [lindex $argv $ii]
-    } elseif {($n>2 && [string match "$a*" --case]) || $a=="-c"} {
+    } elseif {$n>2 && [string match "$a*" --cases)} {
       incr ii
       set TRG(case) [lindex $argv $ii]
-    } elseif {($n>2 && [string match "$a*" --fuzzdb])} {
+    } elseif {$n>2 && [string match "$a*" --fuzzdb]} {
       incr ii
       set env(FUZZDB) [lindex $argv $ii]
     } elseif {[string match "$a*" --stop-on-error]} {
@@ -1453,11 +1453,11 @@ proc add_jobs_from_cmdline {patternlist} {
   #
   if {[info exists TRG(case)] && $TRG(case) ne ""} {
     set jid [trdb one {
-      SELECT jobid FROM jobs WHERE displayname=$TRG(case)
+      SELECT jobid FROM jobs WHERE displayname GLOB $TRG(case)
     }]
     if {$jid eq ""} {
       puts "ERROR: No jobs match \"$TRG(case)\"."
-      puts "The argument to --case must exactly match the jobs.displayname column"
+      puts "The argument to --cases must GLOB match the jobs.displayname column"
       puts "of the testrunner.db database."
       trdb eval {UPDATE jobs SET state='omit'}
     } else {
@@ -1818,20 +1818,7 @@ proc explain_layer {indent depid} {
       puts "${indent}$displayname in $dirname"
       explain_layer "${indent}   " $jobid
     } elseif {$showtests} {
-      if {[lindex $displayname end-3] eq "--slice"} {
-        set M [lindex $displayname end-2]
-        set N [lindex $displayname end-1]
-        set tail "[lindex $displayname end] (slice $M/$N)"
-      } else {
-        set tail [lindex $displayname end]
-      }
-      set e1 [lindex $displayname 1]
-      if {[string match config=* $e1]} {
-        set cfg [string range $e1 7 end]
-        puts "${indent}($cfg) $tail"
-      } else {
-        puts "${indent}$tail"
-      }
+      puts "${indent}$displayname"
     }
   }
 }