From babbd3165f46c2f318836c74fa0f7690d5d2bc28 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 30 Dec 2019 11:58:11 +0000 Subject: [PATCH] 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 --- tests/filter/Dir.mk.expected | 10 ++++++---- tests/filter/Dir.sd.mk | 8 ++++---- tests/filter/Final.mk.expected | 5 +++++ tests/filter/Final.sd.mk | 5 +++++ tests/filter/Prefix.sd.mk | 5 +++++ tests/filter/Suffix.sd.mk | 5 +++++ tests/filter/stderr.expected | 14 +++++++------- tests/filter/sub/dir/Dir.mk.expected | 7 ++++++- tests/filter/sub/dir/Dir.sd.mk | 5 ++++- 9 files changed, 47 insertions(+), 17 deletions(-) diff --git a/tests/filter/Dir.mk.expected b/tests/filter/Dir.mk.expected index 53da9e3..c195980 100644 --- a/tests/filter/Dir.mk.expected +++ b/tests/filter/Dir.mk.expected @@ -1,9 +1,10 @@ # 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 @@ -20,6 +21,7 @@ ${eval ${call some-macro, 42, $$x, { $(foreach something) } }} $TOP_FBAR # doctests: + # Suffix in . all:: $(TOP_TARGETS) sub/all diff --git a/tests/filter/Dir.sd.mk b/tests/filter/Dir.sd.mk index c97ee0f..a9da21f 100644 --- 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 diff --git a/tests/filter/Final.mk.expected b/tests/filter/Final.mk.expected index 8f5c831..0eafd9a 100644 --- a/tests/filter/Final.mk.expected +++ b/tests/filter/Final.mk.expected @@ -1,2 +1,7 @@ # 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 diff --git a/tests/filter/Final.sd.mk b/tests/filter/Final.sd.mk index 0fc2279..d5f7e12 100644 --- 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 &/ diff --git a/tests/filter/Prefix.sd.mk b/tests/filter/Prefix.sd.mk index 45f1ac0..e3784af 100644 --- 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 diff --git a/tests/filter/Suffix.sd.mk b/tests/filter/Suffix.sd.mk index 453de60..a398c1b 100644 --- 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 &. diff --git a/tests/filter/stderr.expected b/tests/filter/stderr.expected index a53c7f7..3389ef9 100644 --- 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 - 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 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: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 ./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 627eaa5..cde814d 100644 --- a/tests/filter/sub/dir/Dir.mk.expected +++ b/tests/filter/sub/dir/Dir.mk.expected @@ -1,6 +1,10 @@ # 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 -# subdirectory test cases sub/dir/ @@ -21,6 +25,7 @@ $(NOWARN1) sub_dir_WARN += 6 # doctests: + # 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 c3603a0..f358e77 100644 --- 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 -- 2.30.2