From: drh <>
Date: Tue, 27 Aug 2024 22:28:03 +0000 (+0000)
Subject: Changes to the way "release" tests were constructed in [d03d35eebaf82709]
X-Git-Tag: version-3.47.0~181
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5b4ca2a11f513d802c1eccea24fd5d128a324e8;p=thirdparty%2Fsqlite.git

Changes to the way "release" tests were constructed in [d03d35eebaf82709]
were incorrect.  Fixed here.  Also enhance --explain to chose permutation
configurations and so that PATTERNS on the the command line can match
against permutation configurations.

FossilOrigin-Name: 1f962ffc9e956a9d6311ed9c02fea13c0fe056283ee2c650a2312a258808b3b3
---

diff --git a/manifest b/manifest
index d025a4f329..de8374a5ce 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\s--status\soverwrite\sin\stestrunner.
-D 2024-08-27T21:44:45.108
+C Changes\sto\sthe\sway\s"release"\stests\swere\sconstructed\sin\s[d03d35eebaf82709]\nwere\sincorrect.\s\sFixed\shere.\s\sAlso\senhance\s--explain\sto\schose\spermutation\nconfigurations\sand\sso\sthat\sPATTERNS\son\sthe\sthe\scommand\sline\scan\smatch\nagainst\spermutation\sconfigurations.
+D 2024-08-27T22:28:03.935
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1714,7 +1714,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 2c203a2dd664298f239f0ec3ce22fbc65b5f021c1e09edbae8452af8a694e052
-F test/testrunner.tcl 0a9e76679856e5782d520f8e4329c18ba655b6bbd19a154f44a4fb5e350be531
+F test/testrunner.tcl de5deab405d25cdb0f85c4b75cc63dc1fa0571b099621b585f083647d7f6d75a
 F test/testrunner_data.tcl 6a0facfbff26f2f8573ebaeb209426bbb59809d5c0f6925f983bd030ab5248cd
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2211,8 +2211,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 6a6ce343b249e269229867b2c2f107a49ac8a8f24ad66801718ef01159655319
-R f5da9843604e1033edc0cf6e244622b0
+P 26372762ab1451eb95d29367f5b2534bde616a37e5e757e72ba2cfe42571d180
+R 66a023125402741fa708637568f51009
 U drh
-Z fa568405ca45a71e0343a4bd7c4efb05
+Z f1950a098efb328b04fe6e5b9690c497
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 13a472ba51..df0f6a1846 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-26372762ab1451eb95d29367f5b2534bde616a37e5e757e72ba2cfe42571d180
+1f962ffc9e956a9d6311ed9c02fea13c0fe056283ee2c650a2312a258808b3b3
diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index 6344d0b0e2..fcb46a9214 100644
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -475,7 +475,7 @@ proc show_status {db cls} {
     set clreol ""
   }
   puts [format %-79.79s "Command: \[testrunner.tcl$cmdline\]$clreol"]
-  puts [format %-79.79s "Cores:   $nJob max $S(running) active"]
+  puts [format %-79.79s "Jobs:    $nJob max $S(running) active"]
   puts [format %-79.79s "Summary: [elapsetime $tm], $fin/$total tasks,\
                          $ne errors, $nt tests"]
 
@@ -880,7 +880,7 @@ proc add_tcl_jobs {build config patternlist {shelldepid ""}} {
         } else {
           set p "$p*"
         }
-        if {[string match $p [file tail $f]]} {
+        if {[string match $p "$config [file tail $f]"]} {
           set bMatch 1
           break
         }
@@ -1100,13 +1100,34 @@ proc add_jobs_from_cmdline {patternlist} {
     }
 
     release {
-      set config_set {}
+      set patternlist [lrange $patternlist 1 end]
       foreach b [trd_builds $TRG(platform)] {
         if {$TRG(config)!="" && ![regexp "\\y$b\\y" $TRG(config)]} continue
         if {[regexp "\\y$b\\y" $TRG(omitconfig)]} continue
-        lappend config_set $b
+        set bld [add_build_job $b $TRG(testfixture)]
+        foreach c [trd_configs $TRG(platform) $b] {
+          add_tcl_jobs $bld $c $patternlist SHELL
+        }
+
+        if {$patternlist==""} {
+          foreach e [trd_extras $TRG(platform) $b] {
+            if {$e=="fuzztest"} {
+              add_fuzztest_jobs $b
+            } else {
+              add_make_job $bld $e
+            }
+          }
+        }
+
+        if {[trdb one "SELECT EXISTS(SELECT 1
+                                       FROM jobs WHERE depid='SHELL')"]} {
+          set sbld [add_shell_build_job $b [lindex $bld 1] [lindex $bld 0]]
+          set sbldid [lindex $sbld 0]
+          trdb eval {
+            UPDATE jobs SET depid=$sbldid WHERE depid='SHELL'
+          }
+        }
       }
-      add_devtest_jobs $config_set [lrange $patternlist 1 end]
     }
 
     list {
@@ -1448,7 +1469,14 @@ proc explain_layer {indent depid} {
       puts "${indent}$displayname in $dirname"
       explain_layer "${indent}   " $jobid
     } elseif {$showtests} {
-      puts "${indent}[lindex $displayname end]"
+      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"
+      }
     }
   }
 }