summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2020-05-01 19:53:48 +0000
committerrillig <rillig@pkgsrc.org>2020-05-01 19:53:48 +0000
commit3594f2a98ba2a7fa662989cdae95ad1af5621e1a (patch)
tree18b046eb1229711f771d7e18e430ee0cfc068afe /regress
parent97d3451b2588c0c871f34360921903103207e4a9 (diff)
downloadpkgsrc-3594f2a98ba2a7fa662989cdae95ad1af5621e1a.tar.gz
mk/subst.mk: fix typo in diagnostic
Diffstat (limited to 'regress')
-rw-r--r--regress/infra-unittests/subst.sh18
1 files changed, 9 insertions, 9 deletions
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' \
'' \