Warning reporting: Report each warning only once

In particular, Prefix and Suffix, or conventional &:include's can
generate a lot of repeated warnings.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/generate b/generate
index 61bbd507c683adc89d5fe648260737a7c0492e73..bae0995bef30dc90fbd19e7cb511d61a0887b99a 100755 (executable)
--- a/generate
+++ b/generate
@@ -198,6 +198,8 @@ sub wrncore ($$) {
 
 sub wrn ($$) {
     my ($wk,$m) = @_;
+    our %warn_dedupe;
+    return 0 if $warn_dedupe{$err_file,$.,$wk,$m}++;
     wrncore($wk, "${err_file}:$.: $m");
 }
 

diff --git a/tests/filter/Prefix.sd.mk b/tests/filter/Prefix.sd.mk
index da3a73574d70e7f95bc536a637575c02137113b5..45f1ac0d6bc68acb38fb46d622df6476b6861394 100644 (file)
--- a/tests/filter/Prefix.sd.mk
+++ b/tests/filter/Prefix.sd.mk
@@ -1 +1,2 @@
 # Prefix in &.
+&:warn many-requests-for-unknown-warning

diff --git a/tests/filter/stderr.expected b/tests/filter/stderr.expected
index 11dab74e7ea85de33fb56923ebf3ec495d0eab6d..fe8b3f26cdda9fc719ebfe841dc3c097a2253664 100644 (file)
--- a/tests/filter/stderr.expected
+++ b/tests/filter/stderr.expected
@@ -1,3 +1,4 @@
+subdirmk: warning (unknown-warning): ./Prefix.sd.mk:2: unknown warning many-requests-for-unknown-warning requested
 subdirmk: warning (single-char-var): ./Dir.sd.mk:8: possibly confusing unbracketed single-char $-expansion
 subdirmk: warning (local+global): saw both WARN and &WARN
  saw WARN at ./Dir.sd.mk:6