From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 29 Dec 2019 15:46:54 +0000 (+0000)
Subject: tests/filter: Test &:local+global & vs non-&
X-Git-Tag: subdirmk/0.3~8
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=commitdiff_plain;h=47aa55cb7beac7a6c3b0b2aafa5189914cee2115

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 0b4f656..c23e275 100644
--- 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 f545495..9fe4f75 100644
--- 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 a939bbf..bc974ea 100644
--- 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