Testrunner.tcl now runs fuzzcheck-asan and fuzzcheck-ubsan tests.

FossilOrigin-Name: 3d8f3a255843c063157265702b76d40c38c774d29d658eea2d77efac92ac8789

4 files changed, 18 insertions, 13 deletions

diff --git a/manifest b/manifest
index d67ae79da..9fc92ec78 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C If\sthe\sFUZZDB\senvironment\svariable\sis\sset\swhen\srunning\stestrunner.tcl\sand\nthat\senv-var\spoints\sto\sa\sfuzzcheck\sdatabase,\sthen\ssuppliment\sthe\sfuzzcheck\ntests\swith\sthat\sextra\sdatabase.
-D 2025-04-28T17:56:23.974
+C Testrunner.tcl\snow\sruns\sfuzzcheck-asan\sand\sfuzzcheck-ubsan\stests.
+D 2025-04-28T19:15:46.161
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -1734,8 +1734,8 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 463ae33b8bf75ac77451df19bd65e7c415c2e9891227c7c9e657d0a2d8e1074a
-F test/testrunner.tcl 7efcd416e2686fc16a479bc7231204ce4b1473e703136cbcbab2091675b4787c x
-F test/testrunner_data.tcl 07f2d36a6321bfd196975aca237db6bba1991032809264a1abeb62e697196d20
+F test/testrunner.tcl c8770b2dea36a6d082f68fda2e1aa21e1c0f893d0ccb326881d82771aa394dad x
+F test/testrunner_data.tcl 5c0a0df38586730be14266deb06d122ffb13d3d329f9aeedf53edd7a40b43bbe
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -2207,8 +2207,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 896d767f1cba64bda7b91b0daebd60ebe4457a58d762da443bf61cf5b39ad2d9
-R f8483dc6f5ebfe6700dbaa0ae0281899
+P c08530dd6a71cb547d164e2313657c917f280e7988211bf199c8776e78a4e2a6
+R ff31b0082651bc2cb2f7c326dab44dfd
 U drh
-Z b87e67a4c1863da23f9d9a564632116e
+Z 9ad34f9de95969e24cbdecdb43b8f051
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 4b60e64c3..9a89bd567 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c08530dd6a71cb547d164e2313657c917f280e7988211bf199c8776e78a4e2a6
+3d8f3a255843c063157265702b76d40c38c774d29d658eea2d77efac92ac8789
diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index 9b0e5ca4b..e755cc384 100755
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -531,7 +531,7 @@ proc show_status {db cls} {
       (SELECT value FROM config WHERE name='start')
   }]
 
-  set total 0
+  set totalw 0
   foreach s {"" ready running done failed omit} { set S($s) 0; set W($s) 0; }
   set workpending 0
   $db eval {
@@ -556,7 +556,7 @@ proc show_status {db cls} {
     flush stdout
   }
   puts [format %-79.79s "Command: \[testrunner.tcl$cmdline\]"]
-  puts [format %-79.79s "Summary: [elapsetime $tm], $fin/$total jobs,\
+  puts [format %-79.79s "Summary: [elapsetime $tm], $fin/$totalw jobs,\
                          $ne errors, $nt tests"]
 
   set srcdir [file dirname [file dirname $TRG(info_script)]]
@@ -1170,7 +1170,7 @@ proc add_fuzztest_jobs {buildname patternlist} {
     set subcmd [lrange $interpreter 1 end]
     set interpreter [lindex $interpreter 0]
 
-    if {$interpreter=="fuzzcheck"
+    if {[string match fuzzcheck* $interpreter]
      && [info exists env(FUZZDB)]
      && [file readable $env(FUZZDB)]
     } {
@@ -1193,7 +1193,9 @@ proc add_fuzztest_jobs {buildname patternlist} {
         set tail [lrange $s 0 end-1]
         lappend tail [file tail $fname]
       }
-      if {![job_matches_any_pattern $patternlist "fuzzcheck $tail"]} continue
+      if {![job_matches_any_pattern $patternlist "$interpreter $tail"]} {
+        continue
+      }
       if {!$bldDone} {
         set bld [add_build_job $buildname $interpreter]
         foreach {depid dirname displayname} $bld {}
diff --git a/test/testrunner_data.tcl b/test/testrunner_data.tcl
index ade126a64..531eaaff7 100644
--- a/test/testrunner_data.tcl
+++ b/test/testrunner_data.tcl
@@ -459,7 +459,10 @@ proc trd_fuzztest_data {} {
     return [list fuzzcheck.exe $lFuzzDb]
   }
 
-  return [list [trd_get_bin_name fuzzcheck] $lFuzzDb {sessionfuzz run} $lSessionDb]
+  return [list [trd_get_bin_name fuzzcheck] $lFuzzDb \
+               [trd_get_bin_name fuzzcheck-asan] $lFuzzDb \
+               [trd_get_bin_name fuzzcheck-ubsan] $lFuzzDb \
+               {sessionfuzz run} $lSessionDb]
 }