diff options
| -rw-r--r-- | mk/subst.mk | 4 | ||||
| -rw-r--r-- | regress/infra-unittests/subst.sh | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/mk/subst.mk b/mk/subst.mk index c5d62eaa901..e27b94adacd 100644 --- a/mk/subst.mk +++ b/mk/subst.mk @@ -1,4 +1,4 @@ -# $NetBSD: subst.mk,v 1.90 2020/05/01 06:42:32 rillig Exp $ +# $NetBSD: subst.mk,v 1.91 2020/05/01 19:53:48 rillig Exp $ # # The subst framework replaces text in one or more files in the WRKSRC # directory. Packages can define several ``classes'' of replacements. @@ -190,7 +190,7 @@ ${_SUBST_COOKIE.${class}}: tmpfile="$$file.subst.sav"; \ [ -d "$$file" ] && continue; \ [ -f "$$file" ] || { \ - ${_SUBST_WARN.${class}} "Ignoring non-existent file \"$$file\"."; \ + ${_SUBST_WARN.${class}} "Ignoring nonexistent file \"$$file\"."; \ continue; \ }; \ ${_SUBST_IS_TEXT_FILE_CMD.${class}} || { \ diff --git a/regress/infra-unittests/subst.sh b/regress/infra-unittests/subst.sh index 1535d6e77ad..ef658a8fea4 100644 --- a/regress/infra-unittests/subst.sh +++ b/regress/infra-unittests/subst.sh @@ -1,5 +1,5 @@ #! /bin/sh -# $NetBSD: subst.sh,v 1.28 2020/05/01 06:42:32 rillig Exp $ +# $NetBSD: subst.sh,v 1.29 2020/05/01 19:53:48 rillig Exp $ # # Tests for mk/subst.mk. # @@ -258,7 +258,7 @@ EOF create_file_lines "expected-output" \ '=> Substituting "class" in nonexistent' \ - 'warning: [subst.mk:class] Ignoring non-existent file "nonexistent".' \ + 'warning: [subst.mk:class] Ignoring nonexistent file "nonexistent".' \ 'fail: [subst.mk:class] The filename pattern "nonexistent" has no effect.' \ '*** Error code 1' \ '' \ @@ -290,7 +290,7 @@ EOF create_file_lines "expected-output" \ '=> Substituting "class" in nonexistent' \ - 'info: [subst.mk:class] Ignoring non-existent file "nonexistent".' + 'info: [subst.mk:class] Ignoring nonexistent file "nonexistent".' assert_that "actual-output" --file-equals "expected-output" assert_that "$exitcode" --equals "0" @@ -318,7 +318,7 @@ EOF create_file_lines "expected-output" \ '=> Substituting "class" in *exist* *not-found*' \ - 'info: [subst.mk:class] Ignoring non-existent file "./*not-found*".' + 'info: [subst.mk:class] Ignoring nonexistent file "./*not-found*".' assert_that "actual-output" --file-equals "expected-output" assert_that "exists" --file-contains-exactly "this example exists" assert_that "$exitcode" --equals "0" @@ -343,9 +343,9 @@ EOF create_file_lines "expected-output" \ '=> Substituting "class" in does not exist' \ - 'info: [subst.mk:class] Ignoring non-existent file "does".' \ - 'info: [subst.mk:class] Ignoring non-existent file "not".' \ - 'info: [subst.mk:class] Ignoring non-existent file "exist".' + 'info: [subst.mk:class] Ignoring nonexistent file "does".' \ + 'info: [subst.mk:class] Ignoring nonexistent file "not".' \ + 'info: [subst.mk:class] Ignoring nonexistent file "exist".' assert_that "actual-output" --file-equals "expected-output" assert_that "$exitcode" --equals "0" @@ -1026,7 +1026,7 @@ if test_case_begin "empty SUBST_SED"; then assert_that "out" --file-is-lines \ '=> Substituting "id" in file' \ - 'warning: [subst.mk:id] Ignoring non-existent file "file".' \ + 'warning: [subst.mk:id] Ignoring nonexistent file "file".' \ 'fail: [subst.mk:id] The filename pattern "file" has no effect.' \ '*** Error code 1' \ '' \ @@ -1060,7 +1060,7 @@ if test_case_begin "typo in SUBST_CLASSES"; then assert_that "out" --file-is-lines \ '=> Substituting "id" in file' \ - 'warning: [subst.mk:id] Ignoring non-existent file "file".' \ + 'warning: [subst.mk:id] Ignoring nonexistent file "file".' \ 'fail: [subst.mk:id] The filename pattern "file" has no effect.' \ '*** Error code 1' \ '' \ |