Consolidate some much-duplicated run-fuzzcheck recipe code in main.mk.

FossilOrigin-Name: c0d9b9fad3a2f23941927f1be2abded3bde2f2b04f7a5f3cc0a54a978020ebaa

diff --git a/main.mk b/main.mk
index 3b4ce443e5122aa72e197fd6a56613db88af8647..ff25719f5f4807ed48b8fd962d4d284fd50cc1b3 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -2203,125 +2203,126 @@ 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
 run-fuzzcheck: run-fuzzcheck-n0
 run-fuzzcheck-n0: fuzzcheck$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck$(T.exe) --slice 0 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-n1
 run-fuzzcheck-n1: fuzzcheck$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck$(T.exe) --slice 1 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-n2
 run-fuzzcheck-n2: fuzzcheck$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck$(T.exe) --slice 2 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-n3
 run-fuzzcheck-n3: fuzzcheck$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck$(T.exe) --slice 3 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-n4
 run-fuzzcheck-n4: fuzzcheck$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck$(T.exe) --slice 4 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-n5
 run-fuzzcheck-n5: fuzzcheck$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck$(T.exe) --slice 5 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-n6
 run-fuzzcheck-n6: fuzzcheck$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck$(T.exe) --slice 6 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-n7
 run-fuzzcheck-n7: fuzzcheck$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck$(T.exe) --slice 7 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-n8
 run-fuzzcheck-n8: fuzzcheck$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck$(T.exe) --slice 8 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-n9
 run-fuzzcheck-n9: fuzzcheck$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck$(T.exe) --slice 9 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-a0
 run-fuzzcheck-a0: fuzzcheck-asan$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck-asan$(T.exe) --slice 0 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-a1
 run-fuzzcheck-a1: fuzzcheck-asan$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck-asan$(T.exe) --slice 1 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-a2
 run-fuzzcheck-a2: fuzzcheck-asan$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck-asan$(T.exe) --slice 2 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-a3
 run-fuzzcheck-a3: fuzzcheck-asan$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck-asan$(T.exe) --slice 3 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-a4
 run-fuzzcheck-a4: fuzzcheck-asan$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck-asan$(T.exe) --slice 4 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-a5
 run-fuzzcheck-a5: fuzzcheck-asan$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck-asan$(T.exe) --slice 5 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-a6
 run-fuzzcheck-a6: fuzzcheck-asan$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck-asan$(T.exe) --slice 6 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-a7
 run-fuzzcheck-a7: fuzzcheck-asan$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck-asan$(T.exe) --slice 7 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-a8
 run-fuzzcheck-a8: fuzzcheck-asan$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck-asan$(T.exe) --slice 8 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-a9
 run-fuzzcheck-a9: fuzzcheck-asan$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck-asan$(T.exe) --slice 9 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-u0
 run-fuzzcheck-u0: fuzzcheck-ubsan$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck-ubsan$(T.exe) --slice 0 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-u1
 run-fuzzcheck-u1: fuzzcheck-ubsan$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck-ubsan$(T.exe) --slice 1 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-u2
 run-fuzzcheck-u2: fuzzcheck-ubsan$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck-ubsan$(T.exe) --slice 2 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-u3
 run-fuzzcheck-u3: fuzzcheck-ubsan$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck-ubsan$(T.exe) --slice 3 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-u4
 run-fuzzcheck-u4: fuzzcheck-ubsan$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck-ubsan$(T.exe) --slice 4 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-u5
 run-fuzzcheck-u5: fuzzcheck-ubsan$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck-ubsan$(T.exe) --slice 5 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-u6
 run-fuzzcheck-u6: fuzzcheck-ubsan$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck-ubsan$(T.exe) --slice 6 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-u7
 run-fuzzcheck-u7: fuzzcheck-ubsan$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck-ubsan$(T.exe) --slice 7 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-u8
 run-fuzzcheck-u8: fuzzcheck-ubsan$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck-ubsan$(T.exe) --slice 8 10 $(FUZZDB)
 run-fuzzcheck: run-fuzzcheck-u9
 run-fuzzcheck-u9: fuzzcheck-ubsan$(T.exe)
-       @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
+       $(FUZZDB_CHECK)
        ./fuzzcheck-ubsan$(T.exe) --slice 9 10 $(FUZZDB)
 
 

diff --git a/manifest b/manifest
index fa23eaa811b08fba3a48f5ef2402f34452118554..c40a6b30a113c415276e0145c44aeb3a8db6de5f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Rework\sthe\srun-fuzzcheck\smakefile\starget\sso\sthat\sit\sbetter\sexploit\sparallelism.\nTest\scase\s"<tt>make\s-j16\srun-fuzzcheck\sFUZZDB=20250222.db</tt>"\nwent\sfrom\s596\sseconds\sdown\sto\s107\sseconds.
-D 2025-03-16T00:13:29.453
+C Consolidate\ssome\smuch-duplicated\srun-fuzzcheck\srecipe\scode\sin\smain.mk.
+D 2025-03-16T11:24:32.667
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -705,7 +705,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 ec71d4fda51578c017ea922cc28cb71395e097bd58900943fd31599933299230
+F main.mk 49dc86f98d28724ffab580159ed46a1c2658d5c01e227794ce8e48128a420967
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -2213,8 +2213,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 e64132723db0c4f2b9a58932a93beb1671e42006eebc1aeaa8f320e717043051
-R a0d6184ee2c59df7a27bc937eaa19775
-U drh
-Z 4d1b91d0df9093e02464f9ab269aee1c
+P 18bda13e197e4b4ec7464b3e70012f71edc05f73d8b14bb48bad452f81c7e185
+R e37b35226abab9636091409f51115d3e
+U stephan
+Z a039519926ce716e9a22d933e09747f3
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index d21cad483e4c7e2be3ade70761a0083e74e7f218..15d7b90e006d072675fe55e079bb4d3e85c3a5e6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-18bda13e197e4b4ec7464b3e70012f71edc05f73d8b14bb48bad452f81c7e185
+c0d9b9fad3a2f23941927f1be2abded3bde2f2b04f7a5f3cc0a54a978020ebaa