Very slight simplification of the run-fuzzcheck rules.

FossilOrigin-Name: c858a39fad30c46aec6a1f81b2d4e56c18ecf7f5cb6d2fe4a32c4b3bb1a6ed64

diff --git a/main.mk b/main.mk
index 97a747566bf4cee9e6d89b8ba40eccd68284609a..93cfe4b7c18173bb1244d5dd3133157fb4fd15e9 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -2203,126 +2203,97 @@ xbin: fuzzcheck-ubsan$(T.exe)
 # What follows is a decomposition of these rules in a way that allows make
 # to run things in parallel when using the -jN option.
 #
-FUZZDB_CHECK = @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+FUZZDB-check:
+       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
 run-fuzzcheck: run-fuzzcheck-n0
-run-fuzzcheck-n0: fuzzcheck$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-n0: FUZZDB-check fuzzcheck$(T.exe)
        ./fuzzcheck$(T.exe) --slice 0 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-n1
-run-fuzzcheck-n1: fuzzcheck$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-n1: FUZZDB-check fuzzcheck$(T.exe)
        ./fuzzcheck$(T.exe) --slice 1 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-n2
-run-fuzzcheck-n2: fuzzcheck$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-n2: FUZZDB-check fuzzcheck$(T.exe)
        ./fuzzcheck$(T.exe) --slice 2 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-n3
-run-fuzzcheck-n3: fuzzcheck$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-n3: FUZZDB-check fuzzcheck$(T.exe)
        ./fuzzcheck$(T.exe) --slice 3 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-n4
-run-fuzzcheck-n4: fuzzcheck$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-n4: FUZZDB-check fuzzcheck$(T.exe)
        ./fuzzcheck$(T.exe) --slice 4 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-n5
-run-fuzzcheck-n5: fuzzcheck$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-n5: FUZZDB-check fuzzcheck$(T.exe)
        ./fuzzcheck$(T.exe) --slice 5 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-n6
-run-fuzzcheck-n6: fuzzcheck$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-n6: FUZZDB-check fuzzcheck$(T.exe)
        ./fuzzcheck$(T.exe) --slice 6 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-n7
-run-fuzzcheck-n7: fuzzcheck$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-n7: FUZZDB-check fuzzcheck$(T.exe)
        ./fuzzcheck$(T.exe) --slice 7 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-n8
-run-fuzzcheck-n8: fuzzcheck$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-n8: FUZZDB-check fuzzcheck$(T.exe)
        ./fuzzcheck$(T.exe) --slice 8 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-n9
-run-fuzzcheck-n9: fuzzcheck$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-n9: FUZZDB-check fuzzcheck$(T.exe)
        ./fuzzcheck$(T.exe) --slice 9 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-a0
-run-fuzzcheck-a0: fuzzcheck-asan$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-a0: FUZZDB-check fuzzcheck-asan$(T.exe)
        ./fuzzcheck-asan$(T.exe) --slice 0 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-a1
-run-fuzzcheck-a1: fuzzcheck-asan$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-a1: FUZZDB-check fuzzcheck-asan$(T.exe)
        ./fuzzcheck-asan$(T.exe) --slice 1 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-a2
-run-fuzzcheck-a2: fuzzcheck-asan$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-a2: FUZZDB-check fuzzcheck-asan$(T.exe)
        ./fuzzcheck-asan$(T.exe) --slice 2 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-a3
-run-fuzzcheck-a3: fuzzcheck-asan$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-a3: FUZZDB-check fuzzcheck-asan$(T.exe)
        ./fuzzcheck-asan$(T.exe) --slice 3 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-a4
-run-fuzzcheck-a4: fuzzcheck-asan$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-a4: FUZZDB-check fuzzcheck-asan$(T.exe)
        ./fuzzcheck-asan$(T.exe) --slice 4 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-a5
-run-fuzzcheck-a5: fuzzcheck-asan$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-a5: FUZZDB-check fuzzcheck-asan$(T.exe)
        ./fuzzcheck-asan$(T.exe) --slice 5 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-a6
-run-fuzzcheck-a6: fuzzcheck-asan$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-a6: FUZZDB-check fuzzcheck-asan$(T.exe)
        ./fuzzcheck-asan$(T.exe) --slice 6 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-a7
-run-fuzzcheck-a7: fuzzcheck-asan$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-a7: FUZZDB-check fuzzcheck-asan$(T.exe)
        ./fuzzcheck-asan$(T.exe) --slice 7 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-a8
-run-fuzzcheck-a8: fuzzcheck-asan$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-a8: FUZZDB-check fuzzcheck-asan$(T.exe)
        ./fuzzcheck-asan$(T.exe) --slice 8 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-a9
-run-fuzzcheck-a9: fuzzcheck-asan$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-a9: FUZZDB-check fuzzcheck-asan$(T.exe)
        ./fuzzcheck-asan$(T.exe) --slice 9 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-u0
-run-fuzzcheck-u0: fuzzcheck-ubsan$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-u0: FUZZDB-check fuzzcheck-ubsan$(T.exe)
        ./fuzzcheck-ubsan$(T.exe) --slice 0 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-u1
-run-fuzzcheck-u1: fuzzcheck-ubsan$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-u1: FUZZDB-check fuzzcheck-ubsan$(T.exe)
        ./fuzzcheck-ubsan$(T.exe) --slice 1 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-u2
-run-fuzzcheck-u2: fuzzcheck-ubsan$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-u2: FUZZDB-check fuzzcheck-ubsan$(T.exe)
        ./fuzzcheck-ubsan$(T.exe) --slice 2 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-u3
-run-fuzzcheck-u3: fuzzcheck-ubsan$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-u3: FUZZDB-check fuzzcheck-ubsan$(T.exe)
        ./fuzzcheck-ubsan$(T.exe) --slice 3 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-u4
-run-fuzzcheck-u4: fuzzcheck-ubsan$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-u4: FUZZDB-check fuzzcheck-ubsan$(T.exe)
        ./fuzzcheck-ubsan$(T.exe) --slice 4 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-u5
-run-fuzzcheck-u5: fuzzcheck-ubsan$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-u5: FUZZDB-check fuzzcheck-ubsan$(T.exe)
        ./fuzzcheck-ubsan$(T.exe) --slice 5 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-u6
-run-fuzzcheck-u6: fuzzcheck-ubsan$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-u6: FUZZDB-check fuzzcheck-ubsan$(T.exe)
        ./fuzzcheck-ubsan$(T.exe) --slice 6 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-u7
-run-fuzzcheck-u7: fuzzcheck-ubsan$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-u7: FUZZDB-check fuzzcheck-ubsan$(T.exe)
        ./fuzzcheck-ubsan$(T.exe) --slice 7 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-u8
-run-fuzzcheck-u8: fuzzcheck-ubsan$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-u8: FUZZDB-check fuzzcheck-ubsan$(T.exe)
        ./fuzzcheck-ubsan$(T.exe) --slice 8 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-u9
-run-fuzzcheck-u9: fuzzcheck-ubsan$(T.exe)
-       $(FUZZDB_CHECK)
+run-fuzzcheck-u9: FUZZDB-check fuzzcheck-ubsan$(T.exe)
        ./fuzzcheck-ubsan$(T.exe) --slice 9 10 $(FUZZDB)
 
 

diff --git a/manifest b/manifest
index df636785e92ddffd3d879942b599895dddd436dc..c88b7cd65cf3e88662e890bf703d75257ce24282 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C General\supdates\sto\sautosetup/README.md.
-D 2025-03-18T11:36:15.450
+C Very\sslight\ssimplification\sof\sthe\srun-fuzzcheck\srules.
+D 2025-03-18T12:31:09.432
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -707,7 +707,7 @@ F ext/wasm/tests/opfs/sahpool/sahpool-pausing.js f264925cfc82155de38cecb3d204c36
 F ext/wasm/tests/opfs/sahpool/sahpool-worker.js bd25a43fc2ab2d1bafd8f2854ad3943ef673f7c3be03e95ecf1612ff6e8e2a61
 F ext/wasm/wasmfs.make 68999f5bd8c489239592d59a420f8c627c99169bbd6fa16a404751f757b9f702
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk 11b4da311dedf3bf0301999b307c117fe1b5e4fdc260cb35105d235db0fec13b
+F main.mk 7006135b902177f7c8bca2733a6820b72a0c6f5a47412b2a7c86668f0398f1fd
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -2215,8 +2215,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 9300f7f42dfd143f77fd51aa9e080099540854d36b6997ab1a16be7d77f78d8e
-R a74ff5093dd14720da044ecaa9143a8b
+P be8ad5cf579662c54b7e7bc492d8ca03b1f9032c5dad9a6b20590ca1ac00840b
+R a4bbfb3e7a3979ba53919b4ea1630c0c
 U stephan
-Z 7470894fe299edfa712004a6589105cc
+Z 147fd9bb2dc3e368a79a71e178280d71
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 456e6406f49d788442401205027ff5116565c680..73ba6486526869095af106c78b1f70ce712e1987 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-be8ad5cf579662c54b7e7bc492d8ca03b1f9032c5dad9a6b20590ca1ac00840b
+c858a39fad30c46aec6a1f81b2d4e56c18ecf7f5cb6d2fe4a32c4b3bb1a6ed64