Module Name: src
Committed By: rillig
Date: Sun Sep 25 12:51:37 UTC 2022
Modified Files:
src/usr.bin/make/unit-tests: cmd-errors-jobs.exp cmd-errors-jobs.mk
cmd-errors.exp cmd-errors.mk cond-token-plain.exp
cond-token-plain.mk varmod-ifelse.exp varmod-ifelse.mk
Log Message:
tests/make: reduce trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/cmd-errors-jobs.exp
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/cmd-errors-jobs.mk
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/cmd-errors.exp
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/cmd-errors.mk
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/make/unit-tests/cond-token-plain.exp
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/make/unit-tests/cond-token-plain.mk
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/make/unit-tests/varmod-ifelse.exp
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/make/unit-tests/varmod-ifelse.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/cmd-errors-jobs.exp
diff -u src/usr.bin/make/unit-tests/cmd-errors-jobs.exp:1.2 src/usr.bin/make/unit-tests/cmd-errors-jobs.exp:1.3
--- src/usr.bin/make/unit-tests/cmd-errors-jobs.exp:1.2 Tue Feb 23 15:19:41 2021
+++ src/usr.bin/make/unit-tests/cmd-errors-jobs.exp Sun Sep 25 12:51:37 2022
@@ -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
Index: src/usr.bin/make/unit-tests/cmd-errors-jobs.mk
diff -u src/usr.bin/make/unit-tests/cmd-errors-jobs.mk:1.1 src/usr.bin/make/unit-tests/cmd-errors-jobs.mk:1.2
--- src/usr.bin/make/unit-tests/cmd-errors-jobs.mk:1.1 Sun Dec 27 05:11:40 2020
+++ src/usr.bin/make/unit-tests/cmd-errors-jobs.mk Sun Sep 25 12:51:37 2022
@@ -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 unclose
# 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.
Index: src/usr.bin/make/unit-tests/cmd-errors.exp
diff -u src/usr.bin/make/unit-tests/cmd-errors.exp:1.5 src/usr.bin/make/unit-tests/cmd-errors.exp:1.6
--- src/usr.bin/make/unit-tests/cmd-errors.exp:1.5 Tue Feb 23 15:19:41 2021
+++ src/usr.bin/make/unit-tests/cmd-errors.exp Sun Sep 25 12:51:37 2022
@@ -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
Index: src/usr.bin/make/unit-tests/cmd-errors.mk
diff -u src/usr.bin/make/unit-tests/cmd-errors.mk:1.4 src/usr.bin/make/unit-tests/cmd-errors.mk:1.5
--- src/usr.bin/make/unit-tests/cmd-errors.mk:1.4 Sun Dec 27 05:11:40 2020
+++ src/usr.bin/make/unit-tests/cmd-errors.mk Sun Sep 25 12:51:37 2022
@@ -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 unclose
# 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.
Index: src/usr.bin/make/unit-tests/cond-token-plain.exp
diff -u src/usr.bin/make/unit-tests/cond-token-plain.exp:1.16 src/usr.bin/make/unit-tests/cond-token-plain.exp:1.17
--- src/usr.bin/make/unit-tests/cond-token-plain.exp:1.16 Thu Mar 3 19:36:35 2022
+++ src/usr.bin/make/unit-tests/cond-token-plain.exp Sun Sep 25 12:51:37 2022
@@ -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"
Index: src/usr.bin/make/unit-tests/cond-token-plain.mk
diff -u src/usr.bin/make/unit-tests/cond-token-plain.mk:1.15 src/usr.bin/make/unit-tests/cond-token-plain.mk:1.16
--- src/usr.bin/make/unit-tests/cond-token-plain.mk:1.15 Thu Dec 30 02:14:55 2021
+++ src/usr.bin/make/unit-tests/cond-token-plain.mk Sun Sep 25 12:51:37 2022
@@ -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
Index: src/usr.bin/make/unit-tests/varmod-ifelse.exp
diff -u src/usr.bin/make/unit-tests/varmod-ifelse.exp:1.13 src/usr.bin/make/unit-tests/varmod-ifelse.exp:1.14
--- src/usr.bin/make/unit-tests/varmod-ifelse.exp:1.13 Sun Sep 4 22:55:00 2022
+++ src/usr.bin/make/unit-tests/varmod-ifelse.exp Sun Sep 25 12:51:37 2022
@@ -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.
Index: src/usr.bin/make/unit-tests/varmod-ifelse.mk
diff -u src/usr.bin/make/unit-tests/varmod-ifelse.mk:1.19 src/usr.bin/make/unit-tests/varmod-ifelse.mk:1.20
--- src/usr.bin/make/unit-tests/varmod-ifelse.mk:1.19 Sun May 8 06:51:27 2022
+++ src/usr.bin/make/unit-tests/varmod-ifelse.mk Sun Sep 25 12:51:37 2022
@@ -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-
# 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
