Legal: Update tests/filter/ inputs and outputs

We judiciously use # vs. &# for the legal comment so that each
expected output file contains one notice.

The following files, which are wholly constructed by running
generate and reviewing the diffs, do not have a legal notice:
  tests/filter/main.mk.expected
  tests/filter/stderr.expected
  tests/filter/sub/Dir.mk.expected
This is OK I think.

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

diff --git a/tests/filter/Dir.mk.expected b/tests/filter/Dir.mk.expected
index 53da9e3ee1bfbb9fe2134c7ae49c2246b64db7be..c195980a9e517153584e455b62c14b6b2047a693 100644 (file)
--- a/tests/filter/Dir.mk.expected
+++ b/tests/filter/Dir.mk.expected
@@ -1,9 +1,10 @@
 # autogenerated - do not edit
 # autogenerated - do not edit

-# Prefix in .
-# test cases for generate script
+# subdirmk - test cases for generate script
+# Copyright various contributors - see top level README.
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# There is NO WARRANTY.

 
 

-# some blank/comment lines to make "saw WARN" come out with 1-
-# and 2-digit line numbers
+# Prefix in .

 
 WARN += 3
 TOP_WARN += 3
 
 WARN += 3
 TOP_WARN += 3


@@ -20,6 +21,7 @@ ${eval ${call  some-macro, 42, $$x, {  $(foreach something) } }}
 $TOP_FBAR
 
 # doctests:
 $TOP_FBAR
 
 # doctests:

+

 # Suffix in .
 
 all:: $(TOP_TARGETS) sub/all
 # Suffix in .
 
 all:: $(TOP_TARGETS) sub/all

diff --git a/tests/filter/Dir.sd.mk b/tests/filter/Dir.sd.mk
index c97ee0f956260fbb347da9404e9837c81028c412..a9da21fcb2599153b26d03d67d4020d0dc352843 100644 (file)
--- a/tests/filter/Dir.sd.mk
+++ b/tests/filter/Dir.sd.mk
@@ -1,7 +1,7 @@
-# test cases for generate script
-
-# some blank/comment lines to make "saw WARN" come out with 1-
-# and 2-digit line numbers
+&# subdirmk - test cases for generate script
+&# Copyright various contributors - see top level README.
+&# SPDX-License-Identifier: LGPL-2.0-or-later
+&# There is NO WARRANTY.

 
 WARN += 3
 &WARN += 3
 
 WARN += 3
 &WARN += 3

diff --git a/tests/filter/Final.mk.expected b/tests/filter/Final.mk.expected
index 8f5c831b5ffed565588e3ffc40c7d296a0e14026..0eafd9abdbb38bc1bc239c856235fb9e345337c3 100644 (file)
--- a/tests/filter/Final.mk.expected
+++ b/tests/filter/Final.mk.expected
@@ -1,2 +1,7 @@
 # autogenerated - do not edit
 # autogenerated - do not edit

+# subdirmk - test cases for generate script
+# Copyright various contributors - see top level README.
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# There is NO WARRANTY.
+

 # Final 
 # Final 

diff --git a/tests/filter/Final.sd.mk b/tests/filter/Final.sd.mk
index 0fc227993c61944df1b3d52392e89a7d0e85f8e1..d5f7e12713ebf214832c96f4f4b2bf414c4e5161 100644 (file)
--- a/tests/filter/Final.sd.mk
+++ b/tests/filter/Final.sd.mk
@@ -1 +1,6 @@
+# subdirmk - test cases for generate script
+# Copyright various contributors - see top level README.
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# There is NO WARRANTY.
+

 # Final &/
 # Final &/

diff --git a/tests/filter/Prefix.sd.mk b/tests/filter/Prefix.sd.mk
index 45f1ac0d6bc68acb38fb46d622df6476b6861394..e3784af6e31e7889cc40191a1d909566bd9b8297 100644 (file)
--- a/tests/filter/Prefix.sd.mk
+++ b/tests/filter/Prefix.sd.mk
@@ -1,2 +1,7 @@
+# subdirmk - test cases for generate script
+# Copyright various contributors - see top level README.
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# There is NO WARRANTY.
+

 # Prefix in &.
 &:warn many-requests-for-unknown-warning
 # Prefix in &.
 &:warn many-requests-for-unknown-warning

diff --git a/tests/filter/Suffix.sd.mk b/tests/filter/Suffix.sd.mk
index 453de60d9ed3a32c9445ba82826ce143f8b15f51..a398c1b4db4f4a453177a676d2a3411fcd7da41d 100644 (file)
--- a/tests/filter/Suffix.sd.mk
+++ b/tests/filter/Suffix.sd.mk
@@ -1 +1,6 @@
+&# subdirmk - test cases for generate script
+&# Copyright various contributors - see top level README.
+&# SPDX-License-Identifier: LGPL-2.0-or-later
+&# There is NO WARRANTY.
+

 # Suffix in &.
 # Suffix in &.

diff --git a/tests/filter/stderr.expected b/tests/filter/stderr.expected
index a53c7f7a7bb2e0c0dc834593988bab22bfdac8f6..3389ef913a529e972e57918859d403b5f8444658 100644 (file)
--- a/tests/filter/stderr.expected
+++ b/tests/filter/stderr.expected
@@ -1,19 +1,19 @@
-subdirmk: warning (unknown-warning): ./Prefix.sd.mk:2: unknown warning many-requests-for-unknown-warning requested
+subdirmk: warning (unknown-warning): ./Prefix.sd.mk:7: 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
 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 ./sub/dir/Dir.sd.mk:24

  saw &NOWARN1 at ./Dir.sd.mk:14
  expectedly 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
  saw &NOWARN1 at ./Dir.sd.mk:14
  expectedly 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

- saw WARN at ./sub/dir/Dir.sd.mk:16

  saw WARN at ./sub/dir/Dir.sd.mk:19
  saw WARN at ./sub/dir/Dir.sd.mk:19

+ saw WARN at ./sub/dir/Dir.sd.mk:22

  saw &WARN at ./Dir.sd.mk:7
  saw &WARN at ./Dir.sd.mk:10
  saw &WARN at ./Dir.sd.mk:11
  saw &WARN at ./Dir.sd.mk:7
  saw &WARN at ./Dir.sd.mk:10
  saw &WARN at ./Dir.sd.mk:11

- saw &WARN at ./sub/dir/Dir.sd.mk:15
- saw &WARN at ./sub/dir/Dir.sd.mk:24
- expectedly saw &WARN at ./sub/dir/Dir.sd.mk:18
-subdirmk: warning (unknown-warning): ./sub/dir/Dir.sd.mk:3: attempt to suppress unknown warning(s) `some-unknown-warning'
+ saw &WARN at ./sub/dir/Dir.sd.mk:18
+ saw &WARN at ./sub/dir/Dir.sd.mk:27
+ expectedly saw &WARN at ./sub/dir/Dir.sd.mk:21
+subdirmk: warning (unknown-warning): ./sub/dir/Dir.sd.mk:6: attempt to suppress unknown warning(s) `some-unknown-warning'

diff --git a/tests/filter/sub/dir/Dir.mk.expected b/tests/filter/sub/dir/Dir.mk.expected
index 627eaa53537a4f3c8c7f865f12956deb26c11043..cde814d0c0db0c499c21705cc3c2fe96df46e0ba 100644 (file)
--- a/tests/filter/sub/dir/Dir.mk.expected
+++ b/tests/filter/sub/dir/Dir.mk.expected
@@ -1,6 +1,10 @@
 # autogenerated - do not edit
 # autogenerated - do not edit

+# subdirmk - test cases for generate script
+# Copyright various contributors - see top level README.
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# There is NO WARRANTY.
+

 # Prefix in sub/dir
 # Prefix in sub/dir

-# subdirectory test cases

 
 
 sub/dir/
 
 
 sub/dir/


@@ -21,6 +25,7 @@ $(NOWARN1)
 sub_dir_WARN += 6
 
 # doctests:
 sub_dir_WARN += 6
 
 # doctests:

+

 # Suffix in sub/dir
 
 sub/dir/all:: $(sub_dir_TARGETS)
 # Suffix in sub/dir
 
 sub/dir/all:: $(sub_dir_TARGETS)

diff --git a/tests/filter/sub/dir/Dir.sd.mk b/tests/filter/sub/dir/Dir.sd.mk
index c3603a0ea543fe976adcbc84a210b633d98bc1ec..f358e77d95e666595466be7b095c8cf2f752abf7 100644 (file)
--- a/tests/filter/sub/dir/Dir.sd.mk
+++ b/tests/filter/sub/dir/Dir.sd.mk
@@ -1,4 +1,7 @@
-# subdirectory test cases
+&# subdirmk - subdirectory test cases
+&# Copyright various contributors - see top level README.
+&# SPDX-License-Identifier: LGPL-2.0-or-later
+&# There is NO WARRANTY.

 
 &:warn !some-unknown-warning
 
 
 &:warn !some-unknown-warning