diff options
| author | fanquake <fanquake@gmail.com> | 2023-05-16 10:55:15 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-05-16 11:13:11 +0100 |
| commit | d819840f38db3269e524d5ca7197e7bc9a05240a (patch) | |
| tree | 233f760bf5b7f565b1d9a8ca0dbe8ea9b6ca5e37 /src/Makefile.test.include | |
| parent | f7036a47459a66a46e86ca38338ee45ab15eed76 (diff) | |
| parent | 1b1ffbd014b931afb9435ec10911b9a7c130d3e5 (diff) | |
| download | bitcoin-d819840f38db3269e524d5ca7197e7bc9a05240a.tar.xz | |
Merge bitcoin/bitcoin#27041: Build: Improve handling of suppressed logging in Makefiles
1b1ffbd014b931afb9435ec10911b9a7c130d3e5 Build: Log when test -f fails in Makefile (TheCharlatan)
541012e621386cd824eed81295206a34ba3ba497 Build: Use AM_V_GEN in Makefiles where appropriate (TheCharlatan)
Pull request description:
This PR triages some behavior around Makefile recipe echoing suppression.
When generating new files as part of the Makefile the recipe is sometimes suppressed with $(AM_V_GEN) and sometimes with `@`. We should prefer $(AM_V_GEN), since this also prints the lines in silent mode. This is arguably more in style with the current recipe echoing.
Before:
`Generated test/data/script_tests.json.h`
Now:
` GEN test/data/script_tests.json.h`
A side effect of this change is that the recipe for generating build.h is now echoed on each make run. Arguably this makes its generation more transparent.
Sometimes the error emitted by `test -f` is currently thrown without any logging. This makes it a bit harder to debug. Instead, print a helpful log message to point the developer in the right direction.
Alternatively this could have been implemented by just removing the recipe echo suppression (@), but the subsequent make output became too noisy.
ACKs for top commit:
fanquake:
ACK 1b1ffbd014b931afb9435ec10911b9a7c130d3e5
Tree-SHA512: e31869fab25e72802b692ce6735f9561912caea903c1577101b64c9cb115c98de01a59300e8ffe7b05b998345c1b64a79226231d7d1453236ac338c62dc9fbb3
Diffstat (limited to 'src/Makefile.test.include')
| -rw-r--r-- | src/Makefile.test.include | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 461022bbfc..aaa5e3158e 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -422,10 +422,9 @@ endif %.json.h: %.json @$(MKDIR_P) $(@D) - @{ \ + $(AM_V_GEN) { \ echo "namespace json_tests{" && \ echo "static unsigned const char $(*F)[] = {" && \ $(HEXDUMP) -v -e '8/1 "0x%02x, "' -e '"\n"' $< | $(SED) -e 's/0x ,//g' && \ echo "};};"; \ } > "$@.new" && mv -f "$@.new" "$@" - @echo "Generated $@" |