summaryrefslogtreecommitdiff
path: root/usr.bin/make
diff options
context:
space:
mode:
authorrillig <rillig@NetBSD.org>2022-09-25 12:51:37 +0000
committerrillig <rillig@NetBSD.org>2022-09-25 12:51:37 +0000
commit9b3c3290582cf76af72dd2b36ff515950fd73793 (patch)
treeae1712d07b6862fe81c3f5c5613cbcaa7eb10134 /usr.bin/make
parentd52219d15f8489765e0ece27f8fc1667d6f223d0 (diff)
tests/make: reduce trailing whitespace
Diffstat (limited to 'usr.bin/make')
-rw-r--r--usr.bin/make/unit-tests/cmd-errors-jobs.exp10
-rw-r--r--usr.bin/make/unit-tests/cmd-errors-jobs.mk12
-rw-r--r--usr.bin/make/unit-tests/cmd-errors.exp10
-rw-r--r--usr.bin/make/unit-tests/cmd-errors.mk12
-rw-r--r--usr.bin/make/unit-tests/cond-token-plain.exp8
-rw-r--r--usr.bin/make/unit-tests/cond-token-plain.mk6
-rw-r--r--usr.bin/make/unit-tests/varmod-ifelse.exp4
-rw-r--r--usr.bin/make/unit-tests/varmod-ifelse.mk4
8 files changed, 33 insertions, 33 deletions
diff --git a/usr.bin/make/unit-tests/cmd-errors-jobs.exp b/usr.bin/make/unit-tests/cmd-errors-jobs.exp
index 9ed0557975b..c6baacfe0ed 100644
--- a/usr.bin/make/unit-tests/cmd-errors-jobs.exp
+++ b/usr.bin/make/unit-tests/cmd-errors-jobs.exp
@@ -1,9 +1,9 @@
-: undefined eol
+: undefined--eol
make: Unclosed variable "UNCLOSED"
-: unclosed-variable
+: unclosed-variable-
make: Unclosed variable expression (expecting '}') for "UNCLOSED"
-: unclosed-modifier
+: unclosed-modifier-
make: Unknown modifier "Z"
-: unknown-modifier eol
-: end eol
+: unknown-modifier--eol
+: end-eol
exit status 0
diff --git a/usr.bin/make/unit-tests/cmd-errors-jobs.mk b/usr.bin/make/unit-tests/cmd-errors-jobs.mk
index 8462a2e3497..b3dc982de35 100644
--- a/usr.bin/make/unit-tests/cmd-errors-jobs.mk
+++ b/usr.bin/make/unit-tests/cmd-errors-jobs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: cmd-errors-jobs.mk,v 1.1 2020/12/27 05:11:40 rillig Exp $
+# $NetBSD: cmd-errors-jobs.mk,v 1.2 2022/09/25 12:51:37 rillig Exp $
#
# Demonstrate how errors in variable expansions affect whether the commands
# are actually executed in jobs mode.
@@ -9,24 +9,24 @@ all: undefined unclosed-variable unclosed-modifier unknown-modifier end
# Undefined variables are not an error. They expand to empty strings.
undefined:
- : $@ ${UNDEFINED} eol
+ : $@-${UNDEFINED}-eol
# XXX: As of 2020-11-01, this command is executed even though it contains
# parse errors.
unclosed-variable:
- : $@ ${UNCLOSED
+ : $@-${UNCLOSED
# XXX: As of 2020-11-01, this command is executed even though it contains
# parse errors.
unclosed-modifier:
- : $@ ${UNCLOSED:
+ : $@-${UNCLOSED:
# XXX: As of 2020-11-01, this command is executed even though it contains
# parse errors.
unknown-modifier:
- : $@ ${UNKNOWN:Z} eol
+ : $@-${UNKNOWN:Z}-eol
end:
- : $@ eol
+ : $@-eol
# XXX: As of 2020-11-02, despite the parse errors, the exit status is 0.
diff --git a/usr.bin/make/unit-tests/cmd-errors.exp b/usr.bin/make/unit-tests/cmd-errors.exp
index 9ed0557975b..c6baacfe0ed 100644
--- a/usr.bin/make/unit-tests/cmd-errors.exp
+++ b/usr.bin/make/unit-tests/cmd-errors.exp
@@ -1,9 +1,9 @@
-: undefined eol
+: undefined--eol
make: Unclosed variable "UNCLOSED"
-: unclosed-variable
+: unclosed-variable-
make: Unclosed variable expression (expecting '}') for "UNCLOSED"
-: unclosed-modifier
+: unclosed-modifier-
make: Unknown modifier "Z"
-: unknown-modifier eol
-: end eol
+: unknown-modifier--eol
+: end-eol
exit status 0
diff --git a/usr.bin/make/unit-tests/cmd-errors.mk b/usr.bin/make/unit-tests/cmd-errors.mk
index 356fe1a3e4a..6d3880684bc 100644
--- a/usr.bin/make/unit-tests/cmd-errors.mk
+++ b/usr.bin/make/unit-tests/cmd-errors.mk
@@ -1,4 +1,4 @@
-# $NetBSD: cmd-errors.mk,v 1.4 2020/12/27 05:11:40 rillig Exp $
+# $NetBSD: cmd-errors.mk,v 1.5 2022/09/25 12:51:37 rillig Exp $
#
# Demonstrate how errors in variable expansions affect whether the commands
# are actually executed in compat mode.
@@ -7,24 +7,24 @@ all: undefined unclosed-variable unclosed-modifier unknown-modifier end
# Undefined variables are not an error. They expand to empty strings.
undefined:
- : $@ ${UNDEFINED} eol
+ : $@-${UNDEFINED}-eol
# XXX: As of 2020-11-01, this command is executed even though it contains
# parse errors.
unclosed-variable:
- : $@ ${UNCLOSED
+ : $@-${UNCLOSED
# XXX: As of 2020-11-01, this command is executed even though it contains
# parse errors.
unclosed-modifier:
- : $@ ${UNCLOSED:
+ : $@-${UNCLOSED:
# XXX: As of 2020-11-01, this command is executed even though it contains
# parse errors.
unknown-modifier:
- : $@ ${UNKNOWN:Z} eol
+ : $@-${UNKNOWN:Z}-eol
end:
- : $@ eol
+ : $@-eol
# XXX: As of 2020-11-02, despite the parse errors, the exit status is 0.
diff --git a/usr.bin/make/unit-tests/cond-token-plain.exp b/usr.bin/make/unit-tests/cond-token-plain.exp
index 90da7644bd9..a508bf62a5e 100644
--- a/usr.bin/make/unit-tests/cond-token-plain.exp
+++ b/usr.bin/make/unit-tests/cond-token-plain.exp
@@ -9,11 +9,11 @@ Comparing "\" != "\"
CondParser_Eval: ${:U#hash} != #hash
Comparing "#hash" != "#hash"
CondParser_Eval: 0 # This is treated as a comment, but why?
-CondParser_Eval: ${0 # comment :?yes:no} != no
-CondParser_Eval: 0 # comment
+CondParser_Eval: ${0 # comment:?yes:no} != no
+CondParser_Eval: 0 # comment
Comparing "no" != "no"
-CondParser_Eval: ${1 # comment :?yes:no} != yes
-CondParser_Eval: 1 # comment
+CondParser_Eval: ${1 # comment:?yes:no} != yes
+CondParser_Eval: 1 # comment
Comparing "yes" != "yes"
CondParser_Eval: ${UNDEF:Uundefined}!=undefined
Comparing "undefined" != "undefined"
diff --git a/usr.bin/make/unit-tests/cond-token-plain.mk b/usr.bin/make/unit-tests/cond-token-plain.mk
index 1e9f30be915..5fb4a72b74a 100644
--- a/usr.bin/make/unit-tests/cond-token-plain.mk
+++ b/usr.bin/make/unit-tests/cond-token-plain.mk
@@ -1,4 +1,4 @@
-# $NetBSD: cond-token-plain.mk,v 1.15 2021/12/30 02:14:55 rillig Exp $
+# $NetBSD: cond-token-plain.mk,v 1.16 2022/09/25 12:51:37 rillig Exp $
#
# Tests for plain tokens (that is, string literals without quotes)
# in .if conditions. These are also called bare words.
@@ -63,10 +63,10 @@
# anybody really use this? This is neither documented nor obvious since
# the '#' is escaped. It's much clearer to write a comment in the line
# above the condition.
-.if ${0 \# comment :?yes:no} != no
+.if ${0 \# comment:?yes:no} != no
. error
.endif
-.if ${1 \# comment :?yes:no} != yes
+.if ${1 \# comment:?yes:no} != yes
. error
.endif
diff --git a/usr.bin/make/unit-tests/varmod-ifelse.exp b/usr.bin/make/unit-tests/varmod-ifelse.exp
index 48e8331ff7a..80361ebf6d6 100644
--- a/usr.bin/make/unit-tests/varmod-ifelse.exp
+++ b/usr.bin/make/unit-tests/varmod-ifelse.exp
@@ -11,8 +11,8 @@ Comparing 1.000000 == 0.000000
make: Bad conditional expression '1 == == 2' in '1 == == 2?yes:no'
Comparing "" != ""
make: "varmod-ifelse.mk" line 92: warning: Oops, the parse error should have been propagated.
-CondParser_Eval: ${ ${:U\$}{VAR} == value :?ok:bad} != "ok"
-CondParser_Eval: ${VAR} == value
+CondParser_Eval: ${ ${:U\$}{VAR} == value:?ok:bad} != "ok"
+CondParser_Eval: ${VAR} == value
Comparing "value" == "value"
Comparing "ok" != "ok"
make: "varmod-ifelse.mk" line 153: no.
diff --git a/usr.bin/make/unit-tests/varmod-ifelse.mk b/usr.bin/make/unit-tests/varmod-ifelse.mk
index a823ae78493..2d1c54943ca 100644
--- a/usr.bin/make/unit-tests/varmod-ifelse.mk
+++ b/usr.bin/make/unit-tests/varmod-ifelse.mk
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-ifelse.mk,v 1.19 2022/05/08 06:51:27 rillig Exp $
+# $NetBSD: varmod-ifelse.mk,v 1.20 2022/09/25 12:51:37 rillig Exp $
#
# Tests for the ${cond:?then:else} variable modifier, which evaluates either
# the then-expression or the else-expression, depending on the condition.
@@ -106,7 +106,7 @@ COND:= ${${UNDEF} == "":?bad-assign:bad-assign}
# from the parser of the .for loop body. See ForLoop_SubstVarLong.
.MAKEFLAGS: -dc
VAR= value
-.if ${ ${:U\$}{VAR} == value :?ok:bad} != "ok"
+.if ${ ${:U\$}{VAR} == value:?ok:bad} != "ok"
. error
.endif
.MAKEFLAGS: -d0