tests/filter: Test &:local+global & vs non-&

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

diff --git a/tests/filter/stderr.expected b/tests/filter/stderr.expected
index 0b4f656debed660accd0aa6cfcec64d4d6e061f8..c23e275095bdd4fb6bb223583de6b15f1ec625a3 100644 (file)
--- a/tests/filter/stderr.expected
+++ b/tests/filter/stderr.expected
@@ -1,6 +1,9 @@
 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 (broken-var-ref): ./Dir.sd.mk:19: broken $&... expansion; you probably meant &$
+subdirmk: warning (local+global): saw both NOWARN1 and &NOWARN1
+ saw NOWARN1 at ./sub/dir/Dir.sd.mk:21
+ saw &NOWARN1 at ./Dir.sd.mk:14
 subdirmk: warning (local+global): saw both WARN and &WARN
  saw WARN at ./Dir.sd.mk:6
  saw WARN at ./Dir.sd.mk:9

diff --git a/tests/filter/sub/dir/Dir.mk.expected b/tests/filter/sub/dir/Dir.mk.expected
index f545495ce6e7059605a85d02af7ba6faa8e2d774..9fe4f7594c2504e687eeff0c31e1088d086d3a07 100644 (file)
--- a/tests/filter/sub/dir/Dir.mk.expected
+++ b/tests/filter/sub/dir/Dir.mk.expected
@@ -16,6 +16,8 @@ WARN += 4
 sub_dir_WARN += 5 # this warning suppressed, precisely
 WARN += 5
 
+$(NOWARN1)
+
 # doctests:
 # Suffix in sub/dir
 

diff --git a/tests/filter/sub/dir/Dir.sd.mk b/tests/filter/sub/dir/Dir.sd.mk
index a939bbfa7d4da7f97580311b52ccb2c9a0d22c5d..bc974eae5950da76e065523d8e7b169993d8d006 100644 (file)
--- a/tests/filter/sub/dir/Dir.sd.mk
+++ b/tests/filter/sub/dir/Dir.sd.mk
@@ -18,5 +18,7 @@ WARN += 4
 &WARN += 5 # this warning suppressed, precisely
 WARN += 5
 
+$(NOWARN1)
+
 # doctests:
 &:include &doctests.sd.mk