Make testrunner.tcl more restrictive about which configurations run

fuzzcheck-asan and fuzzcheck-ubsan.

FossilOrigin-Name: 785599394dde0fb36ae2e07d611f9523a05a0817dbd8c416582b3b682dbfa4ff

diff --git a/manifest b/manifest
index 9fc92ec788f38b6a7a87fc31170423ae500c077a..19f9e94acaec2e2d4bcf95dbcfb6c6ae827d610b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Testrunner.tcl\snow\sruns\sfuzzcheck-asan\sand\sfuzzcheck-ubsan\stests.
-D 2025-04-28T19:15:46.161
+C Make\stestrunner.tcl\smore\srestrictive\sabout\swhich\sconfigurations\srun\nfuzzcheck-asan\sand\sfuzzcheck-ubsan.
+D 2025-04-29T01:37:31.258
 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 c8770b2dea36a6d082f68fda2e1aa21e1c0f893d0ccb326881d82771aa394dad x
-F test/testrunner_data.tcl 5c0a0df38586730be14266deb06d122ffb13d3d329f9aeedf53edd7a40b43bbe
+F test/testrunner.tcl 3ee9722ea8024ad724cd3436ec7661a25bae716b3659a7f0f689c98dc1f40af0 x
+F test/testrunner_data.tcl 81bee1515dde9f032c8e0169492a0428b6476dd7cb54276c237938e110db70d5
 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 c08530dd6a71cb547d164e2313657c917f280e7988211bf199c8776e78a4e2a6
-R ff31b0082651bc2cb2f7c326dab44dfd
+P 3d8f3a255843c063157265702b76d40c38c774d29d658eea2d77efac92ac8789
+R f149be995be74f98448d3cbd3e7855b4
 U drh
-Z 9ad34f9de95969e24cbdecdb43b8f051
+Z 469b94e6776e53378cf6fa455ca8fb8e
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 9a89bd5673e8914ddfc6d229ef6098387efbff31..0c8534eee25c03ef2f73ec0b403e132f0d31a7a1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3d8f3a255843c063157265702b76d40c38c774d29d658eea2d77efac92ac8789
+785599394dde0fb36ae2e07d611f9523a05a0817dbd8c416582b3b682dbfa4ff

diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index e755cc3840f380d77bd711b3574314ec73f884b8..68b7d9974097a1be1fb70bb2f4636687084db256 100755 (executable)
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -1164,8 +1164,9 @@ proc add_make_job {bld target} {
 
 proc add_fuzztest_jobs {buildname patternlist} {
   global env TRG
+  # puts buildname=$buildname
 
-  foreach {interpreter scripts} [trd_fuzztest_data] {
+  foreach {interpreter scripts} [trd_fuzztest_data $buildname] {
     set bldDone 0
     set subcmd [lrange $interpreter 1 end]
     set interpreter [lindex $interpreter 0]

diff --git a/test/testrunner_data.tcl b/test/testrunner_data.tcl
index 531eaaff7b7a3aa403bc960d3e407e0235b9bf1c..8a15080964b13070c513cc5ae88957dde4da632b 100644 (file)
--- a/test/testrunner_data.tcl
+++ b/test/testrunner_data.tcl
@@ -430,7 +430,7 @@ proc trd_extras {platform bld} {
 
 # Usage: 
 #
-#     trd_fuzztest_data
+#     trd_fuzztest_data $buildname
 #
 # This returns data used by testrunner.tcl to run commands equivalent 
 # to [make fuzztest]. The returned value is a list, which should be
@@ -450,19 +450,25 @@ proc trd_extras {platform bld} {
 # directory containing this file). "fuzzcheck" and "sessionfuzz" have .exe
 # extensions on windows.
 #
-proc trd_fuzztest_data {} {
+proc trd_fuzztest_data {buildname} {
   set EXE ""
   set lFuzzDb    [glob [file join $::testdir fuzzdata*.db]] 
   set lSessionDb [glob [file join $::testdir sessionfuzz-data*.db]]
+  set sanBuilds {All-Debug Apple Have-Not Update-Delete-Limit}
 
   if {$::tcl_platform(platform) eq "windows"} {
+    if {$buildname eq "Windows-Win32Heap"} return [list]
     return [list fuzzcheck.exe $lFuzzDb]
+  } elseif {[lsearch $sanBuilds $buildname]>=0} {
+    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]
+  } else {
+    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]
 }