diff options
| author | rillig <rillig@pkgsrc.org> | 2020-04-23 19:30:29 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2020-04-23 19:30:29 +0000 |
| commit | 254978b5b8a8795703558ddd1c98daba64992157 (patch) | |
| tree | afee0e514cd97bcc68eed6bd4a646a8d5b442001 /regress | |
| parent | 40a7384d7102f519552e03320eb4c89cf0c11a07 (diff) | |
| download | pkgsrc-254978b5b8a8795703558ddd1c98daba64992157.tar.gz | |
mk/subst.mk: warn about all noop patterns before erroring out
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/infra-unittests/subst.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/regress/infra-unittests/subst.sh b/regress/infra-unittests/subst.sh index 7210a0814ad..07addd835d6 100644 --- a/regress/infra-unittests/subst.sh +++ b/regress/infra-unittests/subst.sh @@ -938,10 +938,10 @@ if test_case_begin "pattern matches only directory"; then fi -if test_case_begin "first filename pattern has no effect"; then +if test_case_begin "two filename patterns have no effect"; then - # All patterns of SUBST_FILES should be applied before erroring out. - # TODO: also warn about file2 + # All patterns of SUBST_FILES should be applied before erroring out, + # to give a complete picture of the situation. create_file_lines "testcase.mk" \ 'SUBST_CLASSES+= id' \ @@ -963,7 +963,8 @@ if test_case_begin "first filename pattern has no effect"; then assert_that "out" --file-is-lines \ '=> Substituting "id" in file1 file2' \ 'warning: [subst.mk:id] Nothing changed in "file1".' \ - 'fail: [subst.mk:id] The filename pattern "file1" has no effect.' \ + 'warning: [subst.mk:id] Nothing changed in "file2".' \ + 'fail: [subst.mk:id] The filename patterns "file1 file2" have no effect.' \ '*** Error code 1' \ '' \ 'Stop.' \ |