Module Name: src
Committed By: rillig
Date: Sat Oct 24 08:46:08 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: cond-cmp-numeric-eq.mk
cond-cmp-numeric-ge.mk cond-cmp-numeric-gt.mk
cond-cmp-numeric-le.mk cond-cmp-numeric-lt.mk
cond-cmp-numeric-ne.mk cond-cmp-string.mk cond-func-commands.mk
cond-func-defined.mk cond-func-exists.mk cond-func-target.mk
cond-func.mk cond-op-and.mk cond-op-not.mk cond-op-or.mk cond-op.mk
cond-short.mk cond-token-var.mk directive-else.mk
directive-ifndef.mk directive-undef.mk directives.mk envfirst.mk
export-variants.mk export.mk forloop.mk modmisc.mk var-op-assign.mk
varmisc.mk varmod-defined.mk varmod-edge.mk varmod-exclam-shell.mk
varmod-l-name-to-value.mk varmod-match-escape.mk
varmod-order-reverse.mk varmod-order-shuffle.mk varmod-order.mk
varmod-subst-regex.mk varmod-subst.mk varmod-to-lower.mk
varmod-to-upper.mk varmod-undefined.mk varname-dot-newline.mk
varname-dot-shell.mk
Log Message:
make(1): indent directives like .info, .if, .for consistently
Done by "pkglint -F *.mk", no manual corrections.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/cond-cmp-numeric-eq.mk \
src/usr.bin/make/unit-tests/cond-func-commands.mk \
src/usr.bin/make/unit-tests/cond-func-target.mk \
src/usr.bin/make/unit-tests/cond-func.mk \
src/usr.bin/make/unit-tests/cond-op-not.mk \
src/usr.bin/make/unit-tests/cond-token-var.mk \
src/usr.bin/make/unit-tests/directive-else.mk \
src/usr.bin/make/unit-tests/directive-undef.mk \
src/usr.bin/make/unit-tests/export-variants.mk \
src/usr.bin/make/unit-tests/varmod-order-reverse.mk \
src/usr.bin/make/unit-tests/varmod-subst-regex.mk \
src/usr.bin/make/unit-tests/varmod-subst.mk \
src/usr.bin/make/unit-tests/varmod-to-lower.mk \
src/usr.bin/make/unit-tests/varname-dot-newline.mk
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/cond-cmp-numeric-ge.mk \
src/usr.bin/make/unit-tests/cond-cmp-numeric-gt.mk \
src/usr.bin/make/unit-tests/cond-cmp-numeric-le.mk \
src/usr.bin/make/unit-tests/cond-cmp-numeric-lt.mk \
src/usr.bin/make/unit-tests/cond-cmp-numeric-ne.mk \
src/usr.bin/make/unit-tests/varmod-match-escape.mk
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/cond-cmp-string.mk \
src/usr.bin/make/unit-tests/cond-op-or.mk \
src/usr.bin/make/unit-tests/directive-ifndef.mk \
src/usr.bin/make/unit-tests/directives.mk \
src/usr.bin/make/unit-tests/varmod-undefined.mk
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/cond-func-defined.mk \
src/usr.bin/make/unit-tests/cond-func-exists.mk \
src/usr.bin/make/unit-tests/cond-op-and.mk \
src/usr.bin/make/unit-tests/forloop.mk \
src/usr.bin/make/unit-tests/var-op-assign.mk \
src/usr.bin/make/unit-tests/varmod-order-shuffle.mk \
src/usr.bin/make/unit-tests/varmod-order.mk \
src/usr.bin/make/unit-tests/varmod-to-upper.mk
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/cond-op.mk
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/make/unit-tests/cond-short.mk
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/envfirst.mk \
src/usr.bin/make/unit-tests/varmod-exclam-shell.mk \
src/usr.bin/make/unit-tests/varname-dot-shell.mk
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/export.mk
cvs rdiff -u -r1.47 -r1.48 src/usr.bin/make/unit-tests/modmisc.mk
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/make/unit-tests/varmisc.mk
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/varmod-defined.mk \
src/usr.bin/make/unit-tests/varmod-l-name-to-value.mk
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/make/unit-tests/varmod-edge.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/cond-cmp-numeric-eq.mk
diff -u src/usr.bin/make/unit-tests/cond-cmp-numeric-eq.mk:1.3 src/usr.bin/make/unit-tests/cond-cmp-numeric-eq.mk:1.4
--- src/usr.bin/make/unit-tests/cond-cmp-numeric-eq.mk:1.3 Fri Sep 11 15:33:28 2020
+++ src/usr.bin/make/unit-tests/cond-cmp-numeric-eq.mk Sat Oct 24 08:46:08 2020
@@ -1,43 +1,43 @@
-# $NetBSD: cond-cmp-numeric-eq.mk,v 1.3 2020/09/11 15:33:28 rillig Exp $
+# $NetBSD: cond-cmp-numeric-eq.mk,v 1.4 2020/10/24 08:46:08 rillig Exp $
#
# Tests for numeric comparisons with the == operator in .if conditions.
# This comparison yields the same result, whether numeric or character-based.
.if 1 == 1
.else
-.error
+. error
.endif
# This comparison yields the same result, whether numeric or character-based.
.if 1 == 2
-.error
+. error
.endif
.if 2 == 1
-.error
+. error
.endif
# Scientific notation is supported, as per strtod.
.if 2e7 == 2000e4
.else
-.error
+. error
.endif
.if 2000e4 == 2e7
.else
-.error
+. error
.endif
# Trailing zeroes after the decimal point are irrelevant for the numeric
# value.
.if 3.30000 == 3.3
.else
-.error
+. error
.endif
.if 3.3 == 3.30000
.else
-.error
+. error
.endif
# As of 2020-08-23, numeric comparison is implemented as parsing both sides
@@ -46,7 +46,7 @@
# be equal.
.if 1.000000000000000001 == 1.000000000000000002
.else
-.error
+. error
.endif
Index: src/usr.bin/make/unit-tests/cond-func-commands.mk
diff -u src/usr.bin/make/unit-tests/cond-func-commands.mk:1.3 src/usr.bin/make/unit-tests/cond-func-commands.mk:1.4
--- src/usr.bin/make/unit-tests/cond-func-commands.mk:1.3 Sun Aug 23 14:07:20 2020
+++ src/usr.bin/make/unit-tests/cond-func-commands.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: cond-func-commands.mk,v 1.3 2020/08/23 14:07:20 rillig Exp $
+# $NetBSD: cond-func-commands.mk,v 1.4 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the commands() function in .if conditions.
@@ -6,14 +6,14 @@
# The target "target" does not exist yet, therefore it cannot have commands.
.if commands(target)
-.error
+. error
.endif
target:
# Now the target exists, but it still has no commands.
.if commands(target)
-.error
+. error
.endif
target:
@@ -21,7 +21,7 @@ target:
# Even after the comment, the target still has no commands.
.if commands(target)
-.error
+. error
.endif
target:
@@ -29,7 +29,7 @@ target:
# Finally the target has commands.
.if !commands(target)
-.error
+. error
.endif
all:
Index: src/usr.bin/make/unit-tests/cond-func-target.mk
diff -u src/usr.bin/make/unit-tests/cond-func-target.mk:1.3 src/usr.bin/make/unit-tests/cond-func-target.mk:1.4
--- src/usr.bin/make/unit-tests/cond-func-target.mk:1.3 Sun Aug 23 14:07:20 2020
+++ src/usr.bin/make/unit-tests/cond-func-target.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: cond-func-target.mk,v 1.3 2020/08/23 14:07:20 rillig Exp $
+# $NetBSD: cond-func-target.mk,v 1.4 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the target() function in .if conditions.
@@ -6,14 +6,14 @@
# The target "target" does not exist yet.
.if target(target)
-.error
+. error
.endif
target:
# The target exists, even though it does not have any commands.
.if !target(target)
-.error
+. error
.endif
target:
@@ -22,7 +22,7 @@ target:
# Adding a comment to an existing target does not change whether the target
# is defined or not.
.if !target(target)
-.error
+. error
.endif
target:
@@ -31,7 +31,7 @@ target:
# Adding a command to an existing target does not change whether the target
# is defined or not.
.if !target(target)
-.error
+. error
.endif
all:
Index: src/usr.bin/make/unit-tests/cond-func.mk
diff -u src/usr.bin/make/unit-tests/cond-func.mk:1.3 src/usr.bin/make/unit-tests/cond-func.mk:1.4
--- src/usr.bin/make/unit-tests/cond-func.mk:1.3 Sun Sep 27 21:35:16 2020
+++ src/usr.bin/make/unit-tests/cond-func.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: cond-func.mk,v 1.3 2020/09/27 21:35:16 rillig Exp $
+# $NetBSD: cond-func.mk,v 1.4 2020/10/24 08:46:08 rillig Exp $
#
# Tests for those parts of the functions in .if conditions that are common
# among several functions.
@@ -12,27 +12,27 @@ ${:UVAR(value)}= variable name with pare
${:UVAR{value}}= variable name with braces
.if !defined(DEF)
-.error
+. error
.endif
# Horizontal whitespace (space tab) after the opening parenthesis is ignored.
.if !defined( DEF)
-.error
+. error
.endif
# Horizontal whitespace (space tab) before the closing parenthesis is ignored.
.if !defined(DEF )
-.error
+. error
.endif
# The argument of a function must not directly contain whitespace.
.if !defined(A B)
-.error
+. error
.endif
# If necessary, the whitespace can be generated by a variable expression.
.if !defined(${:UA B})
-.error
+. error
.endif
# Characters that could be mistaken for operators must not appear directly
@@ -42,21 +42,21 @@ ${:UVAR{value}}= variable name with brac
# It's not entirely clear why these characters are forbidden.
# The most plausible reason seems to be typo detection.
.if !defined(A&B)
-.error
+. error
.endif
.if !defined(A|B)
-.error
+. error
.endif
# Even parentheses may appear in variable names.
# They must be balanced though.
.if !defined(VAR(value))
-.error
+. error
.endif
# Braces do not have any special meaning when parsing arguments.
.if !defined(VAR{value})
-.error
+. error
.endif
# There may be spaces around the operators and parentheses, and even
Index: src/usr.bin/make/unit-tests/cond-op-not.mk
diff -u src/usr.bin/make/unit-tests/cond-op-not.mk:1.3 src/usr.bin/make/unit-tests/cond-op-not.mk:1.4
--- src/usr.bin/make/unit-tests/cond-op-not.mk:1.3 Fri Aug 28 14:48:37 2020
+++ src/usr.bin/make/unit-tests/cond-op-not.mk Sat Oct 24 08:46:08 2020
@@ -1,21 +1,21 @@
-# $NetBSD: cond-op-not.mk,v 1.3 2020/08/28 14:48:37 rillig Exp $
+# $NetBSD: cond-op-not.mk,v 1.4 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the ! operator in .if conditions.
# The exclamation mark negates its operand.
.if !1
-.error
+. error
.endif
# Exclamation marks can be chained.
# This doesn't happen in practice though.
.if !!!1
-.error
+. error
.endif
# The ! binds more tightly than the &&.
.if !!0 && 1
-.error
+. error
.endif
all:
Index: src/usr.bin/make/unit-tests/cond-token-var.mk
diff -u src/usr.bin/make/unit-tests/cond-token-var.mk:1.3 src/usr.bin/make/unit-tests/cond-token-var.mk:1.4
--- src/usr.bin/make/unit-tests/cond-token-var.mk:1.3 Thu Aug 20 19:43:42 2020
+++ src/usr.bin/make/unit-tests/cond-token-var.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: cond-token-var.mk,v 1.3 2020/08/20 19:43:42 rillig Exp $
+# $NetBSD: cond-token-var.mk,v 1.4 2020/10/24 08:46:08 rillig Exp $
#
# Tests for variables in .if conditions.
@@ -6,19 +6,19 @@ DEF= defined
# A defined variable may appear on either side of the comparison.
.if ${DEF} == ${DEF}
-.info ok
+. info ok
.else
-.error
+. error
.endif
# A variable that appears on the left-hand side must be defined.
.if ${UNDEF} == ${DEF}
-.error
+. error
.endif
# A variable that appears on the right-hand side must be defined.
.if ${DEF} == ${UNDEF}
-.error
+. error
.endif
# A defined variable may appear as an expression of its own.
Index: src/usr.bin/make/unit-tests/directive-else.mk
diff -u src/usr.bin/make/unit-tests/directive-else.mk:1.3 src/usr.bin/make/unit-tests/directive-else.mk:1.4
--- src/usr.bin/make/unit-tests/directive-else.mk:1.3 Sat Aug 29 18:50:25 2020
+++ src/usr.bin/make/unit-tests/directive-else.mk Sat Oct 24 08:46:08 2020
@@ -1,19 +1,19 @@
-# $NetBSD: directive-else.mk,v 1.3 2020/08/29 18:50:25 rillig Exp $
+# $NetBSD: directive-else.mk,v 1.4 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the .else directive.
# The .else directive does not take any arguments.
# As of 2020-08-29, make doesn't warn about this.
.if 0
-.warning must not be reached
+. warning must not be reached
.else 123
-.info ok
+. info ok
.endif
.if 1
-.info ok
+. info ok
.else 123
-.warning must not be reached
+. warning must not be reached
.endif
# An .else without a corresponding .if is an error.
@@ -21,11 +21,11 @@
# Accidental extra .else directives are detected too.
.if 0
-.warning must not be reached
+. warning must not be reached
.else
-.info ok
+. info ok
.else
-.info After an extra .else, everything is skipped.
+. info After an extra .else, everything is skipped.
.endif
all:
Index: src/usr.bin/make/unit-tests/directive-undef.mk
diff -u src/usr.bin/make/unit-tests/directive-undef.mk:1.3 src/usr.bin/make/unit-tests/directive-undef.mk:1.4
--- src/usr.bin/make/unit-tests/directive-undef.mk:1.3 Sun Aug 23 19:30:13 2020
+++ src/usr.bin/make/unit-tests/directive-undef.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: directive-undef.mk,v 1.3 2020/08/23 19:30:13 rillig Exp $
+# $NetBSD: directive-undef.mk,v 1.4 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the .undef directive.
@@ -10,7 +10,7 @@
3= 3
.undef 1 2 3
.if ${1:U_}${2:U_}${3:U_} != _23
-.warning $1$2$3
+. warning $1$2$3
.endif
all:
Index: src/usr.bin/make/unit-tests/export-variants.mk
diff -u src/usr.bin/make/unit-tests/export-variants.mk:1.3 src/usr.bin/make/unit-tests/export-variants.mk:1.4
--- src/usr.bin/make/unit-tests/export-variants.mk:1.3 Sun Sep 13 09:23:48 2020
+++ src/usr.bin/make/unit-tests/export-variants.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: export-variants.mk,v 1.3 2020/09/13 09:23:48 rillig Exp $
+# $NetBSD: export-variants.mk,v 1.4 2020/10/24 08:46:08 rillig Exp $
#
# Test whether exported variables apply to each variant of running
# external commands:
@@ -9,15 +9,15 @@
SHVAR!= env | grep ^UT_ || true
.if ${SHVAR} != ""
-.warning At this point, no variable should be exported.
+. warning At this point, no variable should be exported.
.endif
.if ${:!env | grep ^UT_ || true!} != ""
-.warning At this point, no variable should be exported.
+. warning At this point, no variable should be exported.
.endif
.if ${env | grep ^UT_ || true:L:sh} != ""
-.warning At this point, no variable should be exported.
+. warning At this point, no variable should be exported.
.endif
UT_VAR= value
@@ -25,15 +25,15 @@ UT_VAR= value
SHVAR!= env | grep ^UT_ || true
.if ${SHVAR} != "UT_VAR=value"
-.warning At this point, a single variable should be exported.
+. warning At this point, a single variable should be exported.
.endif
.if ${:!env | grep ^UT_ || true!} != "UT_VAR=value"
-.warning At this point, a single variable should be exported.
+. warning At this point, a single variable should be exported.
.endif
.if ${env | grep ^UT_ || true:L:sh} != "UT_VAR=value"
-.warning At this point, a single variable should be exported.
+. warning At this point, a single variable should be exported.
.endif
all:
Index: src/usr.bin/make/unit-tests/varmod-order-reverse.mk
diff -u src/usr.bin/make/unit-tests/varmod-order-reverse.mk:1.3 src/usr.bin/make/unit-tests/varmod-order-reverse.mk:1.4
--- src/usr.bin/make/unit-tests/varmod-order-reverse.mk:1.3 Sun Aug 16 20:13:10 2020
+++ src/usr.bin/make/unit-tests/varmod-order-reverse.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-order-reverse.mk,v 1.3 2020/08/16 20:13:10 rillig Exp $
+# $NetBSD: varmod-order-reverse.mk,v 1.4 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the :Or variable modifier, which returns the words, sorted in
# descending order.
@@ -6,7 +6,7 @@
NUMBERS= one two three four five six seven eight nine ten
.if ${NUMBERS:Or} != "two three ten six seven one nine four five eight"
-.error ${NUMBERS:Or}
+. error ${NUMBERS:Or}
.endif
all:
Index: src/usr.bin/make/unit-tests/varmod-subst-regex.mk
diff -u src/usr.bin/make/unit-tests/varmod-subst-regex.mk:1.3 src/usr.bin/make/unit-tests/varmod-subst-regex.mk:1.4
--- src/usr.bin/make/unit-tests/varmod-subst-regex.mk:1.3 Fri Aug 28 17:15:04 2020
+++ src/usr.bin/make/unit-tests/varmod-subst-regex.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-subst-regex.mk,v 1.3 2020/08/28 17:15:04 rillig Exp $
+# $NetBSD: varmod-subst-regex.mk,v 1.4 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the :C,from,to, variable modifier.
@@ -10,26 +10,26 @@ all: mod-regex-errors
# the regular expression "a b" since these words don't contain any
# whitespace.
.if ${:Ua b b c:C,a b,,} != "a b b c"
-.error
+. error
.endif
# Using the '1' modifier does not change anything. The '1' modifier just
# means to apply at most 1 replacement in the whole variable expression.
.if ${:Ua b b c:C,a b,,1} != "a b b c"
-.error
+. error
.endif
# The 'W' modifier treats the whole variable value as a single big word,
# containing whitespace. This big word matches the regular expression,
# therefore it gets replaced. Whitespace is preserved after replacing.
.if ${:Ua b b c:C,a b,,W} != " b c"
-.error
+. error
.endif
# The 'g' modifier does not have any effect here since each of the words
# contains the character 'b' a single time.
.if ${:Ua b b c:C,b,,g} != "a c"
-.error
+. error
.endif
# The first :C modifier has the 'W' modifier, which makes the whole
@@ -39,7 +39,7 @@ all: mod-regex-errors
# 'W' modifier would be preserved, only a single underscore would have been
# replaced with an 'x'.
.if ${:U1 2 3 1 2 3:C,1 2,___,Wg:C,_,x,} != "x__ 3 x__ 3"
-.error
+. error
.endif
# The regular expression does not match in the first word.
@@ -50,7 +50,7 @@ all: mod-regex-errors
# and that cannot match the regular expression "..". Therefore only the
# "45" is doubled in the result.
.if ${:U1 23 456:C,..,\0\0,} != "1 2323 45456"
-.error
+. error
.endif
# The modifier '1' applies the replacement at most once, across the whole
@@ -60,7 +60,7 @@ all: mod-regex-errors
# Up to 2020-08-28, the manual page said that the modifiers '1' and 'g'
# were orthogonal, which was wrong.
.if ${:U12345 12345:C,.,\0\0,1} != "112345 12345"
-.error
+. error
.endif
# Multiple asterisks form an invalid regular expression. This produces an
Index: src/usr.bin/make/unit-tests/varmod-subst.mk
diff -u src/usr.bin/make/unit-tests/varmod-subst.mk:1.3 src/usr.bin/make/unit-tests/varmod-subst.mk:1.4
--- src/usr.bin/make/unit-tests/varmod-subst.mk:1.3 Wed Aug 19 06:10:06 2020
+++ src/usr.bin/make/unit-tests/varmod-subst.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-subst.mk,v 1.3 2020/08/19 06:10:06 rillig Exp $
+# $NetBSD: varmod-subst.mk,v 1.4 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the :S,from,to, variable modifier.
@@ -9,56 +9,56 @@ all: mod-subst-dollar
WORDS= sequences of letters
.if ${WORDS:S,,,} != ${WORDS}
-.warning The empty pattern matches something.
+. warning The empty pattern matches something.
.endif
.if ${WORDS:S,e,*,1} != "s*quences of letters"
-.warning The :S modifier flag '1' is not applied exactly once.
+. warning The :S modifier flag '1' is not applied exactly once.
.endif
.if ${WORDS:S,f,*,1} != "sequences o* letters"
-.warning The :S modifier flag '1' is only applied to the first word,\
+. warning The :S modifier flag '1' is only applied to the first word,\
not to the first occurrence.
.endif
.if ${WORDS:S,e,*,} != "s*quences of l*tters"
-.warning The :S modifier does not replace every first match per word.
+. warning The :S modifier does not replace every first match per word.
.endif
.if ${WORDS:S,e,*,g} != "s*qu*nc*s of l*tt*rs"
-.warning The :S modifier flag 'g' does not replace every occurrence.
+. warning The :S modifier flag 'g' does not replace every occurrence.
.endif
.if ${WORDS:S,^sequ,occurr,} != "occurrences of letters"
-.warning The :S modifier fails for a short match anchored at the start.
+. warning The :S modifier fails for a short match anchored at the start.
.endif
.if ${WORDS:S,^of,with,} != "sequences with letters"
-.warning The :S modifier fails for an exact match anchored at the start.
+. warning The :S modifier fails for an exact match anchored at the start.
.endif
.if ${WORDS:S,^office,does not match,} != ${WORDS}
-.warning The :S modifier matches a too long pattern anchored at the start.
+. warning The :S modifier matches a too long pattern anchored at the start.
.endif
.if ${WORDS:S,f$,r,} != "sequences or letters"
-.warning The :S modifier fails for a short match anchored at the end.
+. warning The :S modifier fails for a short match anchored at the end.
.endif
.if ${WORDS:S,s$,,} != "sequence of letter"
-.warning The :S modifier fails to replace one occurrence per word.
+. warning The :S modifier fails to replace one occurrence per word.
.endif
.if ${WORDS:S,of$,,} != "sequences letters"
-.warning The :S modifier fails for an exact match anchored at the end.
+. warning The :S modifier fails for an exact match anchored at the end.
.endif
.if ${WORDS:S,eof$,,} != ${WORDS}
-.warning The :S modifier matches a too long pattern anchored at the end.
+. warning The :S modifier matches a too long pattern anchored at the end.
.endif
.if ${WORDS:S,^of$,,} != "sequences letters"
-.warning The :S modifier does not match a word anchored at both ends.
+. warning The :S modifier does not match a word anchored at both ends.
.endif
.if ${WORDS:S,^o$,,} != ${WORDS}
-.warning The :S modifier matches a prefix anchored at both ends.
+. warning The :S modifier matches a prefix anchored at both ends.
.endif
.if ${WORDS:S,^f$,,} != ${WORDS}
-.warning The :S modifier matches a suffix anchored at both ends.
+. warning The :S modifier matches a suffix anchored at both ends.
.endif
.if ${WORDS:S,^eof$,,} != ${WORDS}
-.warning The :S modifier matches a too long prefix anchored at both ends.
+. warning The :S modifier matches a too long prefix anchored at both ends.
.endif
.if ${WORDS:S,^office$,,} != ${WORDS}
-.warning The :S modifier matches a too long suffix anchored at both ends.
+. warning The :S modifier matches a too long suffix anchored at both ends.
.endif
mod-subst:
Index: src/usr.bin/make/unit-tests/varmod-to-lower.mk
diff -u src/usr.bin/make/unit-tests/varmod-to-lower.mk:1.3 src/usr.bin/make/unit-tests/varmod-to-lower.mk:1.4
--- src/usr.bin/make/unit-tests/varmod-to-lower.mk:1.3 Fri Aug 28 17:21:02 2020
+++ src/usr.bin/make/unit-tests/varmod-to-lower.mk Sat Oct 24 08:46:08 2020
@@ -1,18 +1,18 @@
-# $NetBSD: varmod-to-lower.mk,v 1.3 2020/08/28 17:21:02 rillig Exp $
+# $NetBSD: varmod-to-lower.mk,v 1.4 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the :tl variable modifier, which returns the words in the
# variable value, converted to lowercase.
.if ${:UUPPER:tl} != "upper"
-.error
+. error
.endif
.if ${:Ulower:tl} != "lower"
-.error
+. error
.endif
.if ${:UMixeD case.:tl} != "mixed case."
-.error
+. error
.endif
all:
Index: src/usr.bin/make/unit-tests/varname-dot-newline.mk
diff -u src/usr.bin/make/unit-tests/varname-dot-newline.mk:1.3 src/usr.bin/make/unit-tests/varname-dot-newline.mk:1.4
--- src/usr.bin/make/unit-tests/varname-dot-newline.mk:1.3 Wed Aug 19 05:51:18 2020
+++ src/usr.bin/make/unit-tests/varname-dot-newline.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varname-dot-newline.mk,v 1.3 2020/08/19 05:51:18 rillig Exp $
+# $NetBSD: varname-dot-newline.mk,v 1.4 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the special .newline variable.
#
@@ -11,9 +11,9 @@ NEWLINE:= ${.newline}
.newline= overwritten
.if ${.newline} == ${NEWLINE}
-.info The .newline variable cannot be overwritten. Good.
+. info The .newline variable cannot be overwritten. Good.
.else
-.info The .newline variable can be overwritten. Just don't do that.
+. info The .newline variable can be overwritten. Just don't do that.
.endif
# Restore the original value.
Index: src/usr.bin/make/unit-tests/cond-cmp-numeric-ge.mk
diff -u src/usr.bin/make/unit-tests/cond-cmp-numeric-ge.mk:1.1 src/usr.bin/make/unit-tests/cond-cmp-numeric-ge.mk:1.2
--- src/usr.bin/make/unit-tests/cond-cmp-numeric-ge.mk:1.1 Sun Aug 23 13:50:17 2020
+++ src/usr.bin/make/unit-tests/cond-cmp-numeric-ge.mk Sat Oct 24 08:46:08 2020
@@ -1,65 +1,65 @@
-# $NetBSD: cond-cmp-numeric-ge.mk,v 1.1 2020/08/23 13:50:17 rillig Exp $
+# $NetBSD: cond-cmp-numeric-ge.mk,v 1.2 2020/10/24 08:46:08 rillig Exp $
#
# Tests for numeric comparisons with the >= operator in .if conditions.
# When both sides are equal, the >= operator always yields true.
.if 1 >= 1
.else
-.error
+. error
.endif
# This comparison yields the same result, whether numeric or character-based.
.if 1 >= 2
-.error
+. error
.endif
.if 2 >= 1
.else
-.error
+. error
.endif
# If this comparison were character-based instead of numerical, the
# 5 would be >= 14 since its first digit is greater.
.if 5 >= 14
-.error
+. error
.endif
.if 14 >= 5
.else
-.error
+. error
.endif
# Scientific notation is supported, as per strtod.
.if 2e7 >= 1e8
-.error
+. error
.endif
.if 1e8 >= 2e7
.else
-.error
+. error
.endif
# Floating pointer numbers can be compared as well.
# This might be tempting to use for version numbers, but there are a few pitfalls.
.if 3.141 >= 111.222
-.error
+. error
.endif
.if 111.222 >= 3.141
.else
-.error
+. error
.endif
# When parsed as a version number, 3.30 is greater than 3.7.
# Since make parses numbers as plain numbers, that leads to wrong results.
# Numeric comparisons are not suited for comparing version number.
.if 3.30 >= 3.7
-.error
+. error
.endif
.if 3.7 >= 3.30
.else
-.error
+. error
.endif
# As of 2020-08-23, numeric comparison is implemented as parsing both sides
@@ -68,7 +68,7 @@
# be equal.
.if 1.000000000000000001 >= 1.000000000000000002
.else
-.error
+. error
.endif
all:
Index: src/usr.bin/make/unit-tests/cond-cmp-numeric-gt.mk
diff -u src/usr.bin/make/unit-tests/cond-cmp-numeric-gt.mk:1.1 src/usr.bin/make/unit-tests/cond-cmp-numeric-gt.mk:1.2
--- src/usr.bin/make/unit-tests/cond-cmp-numeric-gt.mk:1.1 Sun Aug 23 13:50:17 2020
+++ src/usr.bin/make/unit-tests/cond-cmp-numeric-gt.mk Sat Oct 24 08:46:08 2020
@@ -1,64 +1,64 @@
-# $NetBSD: cond-cmp-numeric-gt.mk,v 1.1 2020/08/23 13:50:17 rillig Exp $
+# $NetBSD: cond-cmp-numeric-gt.mk,v 1.2 2020/10/24 08:46:08 rillig Exp $
#
# Tests for numeric comparisons with the > operator in .if conditions.
# When both sides are equal, the > operator always yields false.
.if 1 > 1
-.error
+. error
.endif
# This comparison yields the same result, whether numeric or character-based.
.if 1 > 2
-.error
+. error
.endif
.if 2 > 1
.else
-.error
+. error
.endif
# If this comparison were character-based instead of numerical, the
# 5 would be > 14 since its first digit is greater.
.if 5 > 14
-.error
+. error
.endif
.if 14 > 5
.else
-.error
+. error
.endif
# Scientific notation is supported, as per strtod.
.if 2e7 > 1e8
-.error
+. error
.endif
.if 1e8 > 2e7
.else
-.error
+. error
.endif
# Floating pointer numbers can be compared as well.
# This might be tempting to use for version numbers, but there are a few pitfalls.
.if 3.141 > 111.222
-.error
+. error
.endif
.if 111.222 > 3.141
.else
-.error
+. error
.endif
# When parsed as a version number, 3.30 is greater than 3.7.
# Since make parses numbers as plain numbers, that leads to wrong results.
# Numeric comparisons are not suited for comparing version number.
.if 3.30 > 3.7
-.error
+. error
.endif
.if 3.7 > 3.30
.else
-.error
+. error
.endif
# As of 2020-08-23, numeric comparison is implemented as parsing both sides
@@ -66,7 +66,7 @@
# typically 16 or 17 significant digits, therefore these two numbers seem to
# be equal.
.if 1.000000000000000001 > 1.000000000000000002
-.error
+. error
.endif
all:
Index: src/usr.bin/make/unit-tests/cond-cmp-numeric-le.mk
diff -u src/usr.bin/make/unit-tests/cond-cmp-numeric-le.mk:1.1 src/usr.bin/make/unit-tests/cond-cmp-numeric-le.mk:1.2
--- src/usr.bin/make/unit-tests/cond-cmp-numeric-le.mk:1.1 Sun Aug 23 13:50:17 2020
+++ src/usr.bin/make/unit-tests/cond-cmp-numeric-le.mk Sat Oct 24 08:46:08 2020
@@ -1,53 +1,53 @@
-# $NetBSD: cond-cmp-numeric-le.mk,v 1.1 2020/08/23 13:50:17 rillig Exp $
+# $NetBSD: cond-cmp-numeric-le.mk,v 1.2 2020/10/24 08:46:08 rillig Exp $
#
# Tests for numeric comparisons with the <= operator in .if conditions.
# When both sides are equal, the <= operator always yields true.
.if 1 <= 1
.else
-.error
+. error
.endif
# This comparison yields the same result, whether numeric or character-based.
.if 1 <= 2
.else
-.error
+. error
.endif
.if 2 <= 1
-.error
+. error
.endif
# If this comparison were character-based instead of numerical, the
# 5 would be >= 14 since its first digit is greater.
.if 5 <= 14
.else
-.error
+. error
.endif
.if 14 <= 5
-.error
+. error
.endif
# Scientific notation is supported, as per strtod.
.if 2e7 <= 1e8
.else
-.error
+. error
.endif
.if 1e8 <= 2e7
-.error
+. error
.endif
# Floating pointer numbers can be compared as well.
# This might be tempting to use for version numbers, but there are a few pitfalls.
.if 3.141 <= 111.222
.else
-.error
+. error
.endif
.if 111.222 <= 3.141
-.error
+. error
.endif
# When parsed as a version number, 3.30 is greater than 3.7.
@@ -55,11 +55,11 @@
# Numeric comparisons are not suited for comparing version number.
.if 3.30 <= 3.7
.else
-.error
+. error
.endif
.if 3.7 <= 3.30
-.error
+. error
.endif
# As of 2020-08-23, numeric comparison is implemented as parsing both sides
@@ -68,7 +68,7 @@
# be equal.
.if 1.000000000000000001 <= 1.000000000000000002
.else
-.error
+. error
.endif
all:
Index: src/usr.bin/make/unit-tests/cond-cmp-numeric-lt.mk
diff -u src/usr.bin/make/unit-tests/cond-cmp-numeric-lt.mk:1.1 src/usr.bin/make/unit-tests/cond-cmp-numeric-lt.mk:1.2
--- src/usr.bin/make/unit-tests/cond-cmp-numeric-lt.mk:1.1 Sun Aug 23 13:50:17 2020
+++ src/usr.bin/make/unit-tests/cond-cmp-numeric-lt.mk Sat Oct 24 08:46:08 2020
@@ -1,52 +1,52 @@
-# $NetBSD: cond-cmp-numeric-lt.mk,v 1.1 2020/08/23 13:50:17 rillig Exp $
+# $NetBSD: cond-cmp-numeric-lt.mk,v 1.2 2020/10/24 08:46:08 rillig Exp $
#
# Tests for numeric comparisons with the < operator in .if conditions.
# When both sides are equal, the < operator always yields false.
.if 1 < 1
-.error
+. error
.endif
# This comparison yields the same result, whether numeric or character-based.
.if 1 < 2
.else
-.error
+. error
.endif
.if 2 < 1
-.error
+. error
.endif
# If this comparison were character-based instead of numerical, the
# 5 would be > 14 since its first digit is greater.
.if 5 < 14
.else
-.error
+. error
.endif
.if 14 < 5
-.error
+. error
.endif
# Scientific notation is supported, as per strtod.
.if 2e7 < 1e8
.else
-.error
+. error
.endif
.if 1e8 < 2e7
-.error
+. error
.endif
# Floating pointer numbers can be compared as well.
# This might be tempting to use for version numbers, but there are a few pitfalls.
.if 3.141 < 111.222
.else
-.error
+. error
.endif
.if 111.222 < 3.141
-.error
+. error
.endif
# When parsed as a version number, 3.30 is greater than 3.7.
@@ -54,11 +54,11 @@
# Numeric comparisons are not suited for comparing version number.
.if 3.30 < 3.7
.else
-.error
+. error
.endif
.if 3.7 < 3.30
-.error
+. error
.endif
# As of 2020-08-23, numeric comparison is implemented as parsing both sides
@@ -66,7 +66,7 @@
# typically 16 or 17 significant digits, therefore these two numbers seem to
# be equal.
.if 1.000000000000000001 < 1.000000000000000002
-.error
+. error
.endif
all:
Index: src/usr.bin/make/unit-tests/cond-cmp-numeric-ne.mk
diff -u src/usr.bin/make/unit-tests/cond-cmp-numeric-ne.mk:1.1 src/usr.bin/make/unit-tests/cond-cmp-numeric-ne.mk:1.2
--- src/usr.bin/make/unit-tests/cond-cmp-numeric-ne.mk:1.1 Sun Aug 23 13:50:17 2020
+++ src/usr.bin/make/unit-tests/cond-cmp-numeric-ne.mk Sat Oct 24 08:46:08 2020
@@ -1,40 +1,40 @@
-# $NetBSD: cond-cmp-numeric-ne.mk,v 1.1 2020/08/23 13:50:17 rillig Exp $
+# $NetBSD: cond-cmp-numeric-ne.mk,v 1.2 2020/10/24 08:46:08 rillig Exp $
#
# Tests for numeric comparisons with the != operator in .if conditions.
# When both sides are equal, the != operator always yields false.
.if 1 != 1
-.error
+. error
.endif
# This comparison yields the same result, whether numeric or character-based.
.if 1 != 2
.else
-.error
+. error
.endif
.if 2 != 1
.else
-.error
+. error
.endif
# Scientific notation is supported, as per strtod.
.if 2e7 != 2000e4
-.error
+. error
.endif
.if 2000e4 != 2e7
-.error
+. error
.endif
# Trailing zeroes after the decimal point are irrelevant for the numeric
# value.
.if 3.30000 != 3.3
-.error
+. error
.endif
.if 3.3 != 3.30000
-.error
+. error
.endif
# As of 2020-08-23, numeric comparison is implemented as parsing both sides
@@ -42,7 +42,7 @@
# typically 16 or 17 significant digits, therefore these two numbers seem to
# be equal.
.if 1.000000000000000001 != 1.000000000000000002
-.error
+. error
.endif
all:
Index: src/usr.bin/make/unit-tests/varmod-match-escape.mk
diff -u src/usr.bin/make/unit-tests/varmod-match-escape.mk:1.1 src/usr.bin/make/unit-tests/varmod-match-escape.mk:1.2
--- src/usr.bin/make/unit-tests/varmod-match-escape.mk:1.1 Sun Aug 16 20:03:53 2020
+++ src/usr.bin/make/unit-tests/varmod-match-escape.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-match-escape.mk,v 1.1 2020/08/16 20:03:53 rillig Exp $
+# $NetBSD: varmod-match-escape.mk,v 1.2 2020/10/24 08:46:08 rillig Exp $
#
# As of 2020-08-01, the :M and :N modifiers interpret backslashes differently,
# depending on whether there was a variable expression somewhere before the
@@ -12,7 +12,7 @@
SPECIALS= \: : \\ * \*
RELEVANT= yes
.if ${SPECIALS:M${:U}\:} != ${SPECIALS:M\:${:U}}
-.warning unexpected
+. warning unexpected
.endif
RELEVANT= no
Index: src/usr.bin/make/unit-tests/cond-cmp-string.mk
diff -u src/usr.bin/make/unit-tests/cond-cmp-string.mk:1.5 src/usr.bin/make/unit-tests/cond-cmp-string.mk:1.6
--- src/usr.bin/make/unit-tests/cond-cmp-string.mk:1.5 Fri Sep 11 15:33:28 2020
+++ src/usr.bin/make/unit-tests/cond-cmp-string.mk Sat Oct 24 08:46:08 2020
@@ -1,41 +1,41 @@
-# $NetBSD: cond-cmp-string.mk,v 1.5 2020/09/11 15:33:28 rillig Exp $
+# $NetBSD: cond-cmp-string.mk,v 1.6 2020/10/24 08:46:08 rillig Exp $
#
# Tests for string comparisons in .if conditions.
# This is a simple comparison of string literals.
# Nothing surprising here.
.if "str" != "str"
-.error
+. error
.endif
# The right-hand side of the comparison may be written without quotes.
.if "str" != str
-.error
+. error
.endif
# The left-hand side of the comparison must be enclosed in quotes.
# This one is not enclosed in quotes and thus generates an error message.
.if str != str
-.error
+. error
.endif
# The left-hand side of the comparison requires a defined variable.
# The variable named "" is not defined, but applying the :U modifier to it
# makes it "kind of defined" (see VAR_KEEP). Therefore it is ok here.
.if ${:Ustr} != "str"
-.error
+. error
.endif
# Any character in a string literal may be escaped using a backslash.
# This means that "\n" does not mean a newline but a simple "n".
.if "string" != "\s\t\r\i\n\g"
-.error
+. error
.endif
# It is not possible to concatenate two string literals to form a single
# string.
.if "string" != "str""ing"
-.error
+. error
.endif
# There is no = operator for strings.
Index: src/usr.bin/make/unit-tests/cond-op-or.mk
diff -u src/usr.bin/make/unit-tests/cond-op-or.mk:1.5 src/usr.bin/make/unit-tests/cond-op-or.mk:1.6
--- src/usr.bin/make/unit-tests/cond-op-or.mk:1.5 Fri Sep 11 06:51:38 2020
+++ src/usr.bin/make/unit-tests/cond-op-or.mk Sat Oct 24 08:46:08 2020
@@ -1,21 +1,21 @@
-# $NetBSD: cond-op-or.mk,v 1.5 2020/09/11 06:51:38 rillig Exp $
+# $NetBSD: cond-op-or.mk,v 1.6 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the || operator in .if conditions.
.if 0 || 0
-.error
+. error
.endif
.if !(1 || 0)
-.error
+. error
.endif
.if !(0 || 1)
-.error
+. error
.endif
.if !(1 || 1)
-.error
+. error
.endif
# The right-hand side is not evaluated since the left-hand side is already
Index: src/usr.bin/make/unit-tests/directive-ifndef.mk
diff -u src/usr.bin/make/unit-tests/directive-ifndef.mk:1.5 src/usr.bin/make/unit-tests/directive-ifndef.mk:1.6
--- src/usr.bin/make/unit-tests/directive-ifndef.mk:1.5 Mon Oct 5 19:27:48 2020
+++ src/usr.bin/make/unit-tests/directive-ifndef.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: directive-ifndef.mk,v 1.5 2020/10/05 19:27:48 rillig Exp $
+# $NetBSD: directive-ifndef.mk,v 1.6 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the .ifndef directive, which can be used for multiple-inclusion
# guards. In contrast to C, where #ifndef and #define nicely line up the
@@ -7,17 +7,17 @@
.ifndef GUARD
GUARD= # defined
-.info guarded section
+. info guarded section
.endif
.ifndef GUARD
GUARD= # defined
-.info guarded section
+. info guarded section
.endif
.if !defined(GUARD)
GUARD= # defined
-.info guarded section
+. info guarded section
.endif
all:
Index: src/usr.bin/make/unit-tests/directives.mk
diff -u src/usr.bin/make/unit-tests/directives.mk:1.5 src/usr.bin/make/unit-tests/directives.mk:1.6
--- src/usr.bin/make/unit-tests/directives.mk:1.5 Tue Jul 28 20:57:59 2020
+++ src/usr.bin/make/unit-tests/directives.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: directives.mk,v 1.5 2020/07/28 20:57:59 rillig Exp $
+# $NetBSD: directives.mk,v 1.6 2020/10/24 08:46:08 rillig Exp $
#
# Tests for parsing directives, in the same order as in the manual page.
#
@@ -120,21 +120,21 @@
.info which branch is taken on misspelling after false?
.if 0
.elsif 1
-.info 1 taken
+. info 1 taken
.elsif 2
-.info 2 taken
+. info 2 taken
.else
-.info else taken
+. info else taken
.endif
.info which branch is taken on misspelling after true?
.if 1
.elsif 1
-.info 1 taken
+. info 1 taken
.elsif 2
-.info 2 taken
+. info 2 taken
.else
-.info else taken
+. info else taken
.endif
.indented none
Index: src/usr.bin/make/unit-tests/varmod-undefined.mk
diff -u src/usr.bin/make/unit-tests/varmod-undefined.mk:1.5 src/usr.bin/make/unit-tests/varmod-undefined.mk:1.6
--- src/usr.bin/make/unit-tests/varmod-undefined.mk:1.5 Sat Sep 12 07:04:51 2020
+++ src/usr.bin/make/unit-tests/varmod-undefined.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-undefined.mk,v 1.5 2020/09/12 07:04:51 rillig Exp $
+# $NetBSD: varmod-undefined.mk,v 1.6 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the :U variable modifier, which returns the given string
# if the variable is undefined.
@@ -22,7 +22,7 @@
# nested.
.if ${:U${:Unested}${${${:Udeeply}}}} != nested
-.error
+. error
.endif
# The nested variable expressions may contain braces, and these braces don't
@@ -32,7 +32,7 @@
# For more similar examples, see varmod-subst.mk, mod-subst-delimiter.
.if ${:U${:Uvalue:S{a{X{}} != vXlue
-.error
+. error
.endif
# The escaping rules for the :U modifier (left-hand side) and condition
@@ -50,7 +50,7 @@
# Whitespace at the edges is preserved, on both sides of the comparison.
#
.if ${:U \: \} \$ \\ \a \b \n } != " : } \$ \\ \\a \\b \\n "
-.error
+. error
.endif
# Even after the :U modifier has been applied, the expression still remembers
Index: src/usr.bin/make/unit-tests/cond-func-defined.mk
diff -u src/usr.bin/make/unit-tests/cond-func-defined.mk:1.4 src/usr.bin/make/unit-tests/cond-func-defined.mk:1.5
--- src/usr.bin/make/unit-tests/cond-func-defined.mk:1.4 Sun Sep 27 21:35:16 2020
+++ src/usr.bin/make/unit-tests/cond-func-defined.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: cond-func-defined.mk,v 1.4 2020/09/27 21:35:16 rillig Exp $
+# $NetBSD: cond-func-defined.mk,v 1.5 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the defined() function in .if conditions.
@@ -6,27 +6,27 @@ DEF= defined
${:UA B}= variable name with spaces
.if !defined(DEF)
-.error
+. error
.endif
# Horizontal whitespace (space tab) after the opening parenthesis is ignored.
.if !defined( DEF)
-.error
+. error
.endif
# Horizontal whitespace (space tab) before the closing parenthesis is ignored.
.if !defined(DEF )
-.error
+. error
.endif
# The argument of a function must not directly contain whitespace.
.if !defined(A B)
-.error
+. error
.endif
# If necessary, the whitespace can be generated by a variable expression.
.if !defined(${:UA B})
-.error
+. error
.endif
all:
Index: src/usr.bin/make/unit-tests/cond-func-exists.mk
diff -u src/usr.bin/make/unit-tests/cond-func-exists.mk:1.4 src/usr.bin/make/unit-tests/cond-func-exists.mk:1.5
--- src/usr.bin/make/unit-tests/cond-func-exists.mk:1.4 Fri Aug 28 12:59:36 2020
+++ src/usr.bin/make/unit-tests/cond-func-exists.mk Sat Oct 24 08:46:08 2020
@@ -1,41 +1,41 @@
-# $NetBSD: cond-func-exists.mk,v 1.4 2020/08/28 12:59:36 rillig Exp $
+# $NetBSD: cond-func-exists.mk,v 1.5 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the exists() function in .if conditions.
.if !exists(.)
-.error
+. error
.endif
# The argument to the function must not be enclosed in quotes.
# Neither double quotes nor single quotes are allowed.
.if exists(".")
-.error
+. error
.endif
.if exists('.')
-.error
+. error
.endif
# The only way to escape characters that would otherwise influence the parser
# is to enclose them in a variable expression. For function arguments,
# neither the backslash nor the dollar sign act as escape character.
.if exists(\.)
-.error
+. error
.endif
.if !exists(${:U.})
-.error
+. error
.endif
# The argument to the function can have several variable expressions.
# See cond-func.mk for the characters that cannot be used directly.
.if !exists(${.PARSEDIR}/${.PARSEFILE})
-.error
+. error
.endif
# Whitespace is trimmed on both sides of the function argument.
.if !exists( . )
-.error
+. error
.endif
all:
Index: src/usr.bin/make/unit-tests/cond-op-and.mk
diff -u src/usr.bin/make/unit-tests/cond-op-and.mk:1.4 src/usr.bin/make/unit-tests/cond-op-and.mk:1.5
--- src/usr.bin/make/unit-tests/cond-op-and.mk:1.4 Thu Sep 10 22:38:57 2020
+++ src/usr.bin/make/unit-tests/cond-op-and.mk Sat Oct 24 08:46:08 2020
@@ -1,21 +1,21 @@
-# $NetBSD: cond-op-and.mk,v 1.4 2020/09/10 22:38:57 rillig Exp $
+# $NetBSD: cond-op-and.mk,v 1.5 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the && operator in .if conditions.
.if 0 && 0
-.error
+. error
.endif
.if 1 && 0
-.error
+. error
.endif
.if 0 && 1
-.error
+. error
.endif
.if !(1 && 1)
-.error
+. error
.endif
# The right-hand side is not evaluated since the left-hand side is already
Index: src/usr.bin/make/unit-tests/forloop.mk
diff -u src/usr.bin/make/unit-tests/forloop.mk:1.4 src/usr.bin/make/unit-tests/forloop.mk:1.5
--- src/usr.bin/make/unit-tests/forloop.mk:1.4 Sat Oct 24 08:34:59 2020
+++ src/usr.bin/make/unit-tests/forloop.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: forloop.mk,v 1.4 2020/10/24 08:34:59 rillig Exp $
+# $NetBSD: forloop.mk,v 1.5 2020/10/24 08:46:08 rillig Exp $
all: for-loop
@@ -10,36 +10,36 @@ for-fail:
XTRA_LIST = xtra
.else
-.for x in ${LIST}
+. for x in ${LIST}
X!= echo 'x=$x' >&2; echo
-.endfor
+. endfor
CFL = -I/this -I"This or that" -Ithat "-DTHIS=\"this and that\""
cfl=
-.for x in ${CFL}
+. for x in ${CFL}
X!= echo 'x=$x' >&2; echo
-.if empty(cfl)
+. if empty(cfl)
cfl= $x
-.else
+. else
cfl+= $x
-.endif
-.endfor
+. endif
+. endfor
X!= echo 'cfl=${cfl}' >&2; echo
-.if ${cfl} != ${CFL}
-.error ${.newline}'${cfl}' != ${.newline}'${CFL}'
-.endif
+. if ${cfl} != ${CFL}
+. error ${.newline}'${cfl}' != ${.newline}'${CFL}'
+. endif
-.for a b in ${EMPTY}
+. for a b in ${EMPTY}
X!= echo 'a=$a b=$b' >&2; echo
-.endfor
+. endfor
# Since at least 1993, iteration stops at the first newline.
# Back then, the .newline variable didn't exist, therefore it was unlikely
# that a newline ever occurred.
-.for var in a${.newline}b${.newline}c
+. for var in a${.newline}b${.newline}c
X!= echo 'newline-item=('${var:Q}')' 1>&2; echo
-.endfor
+. endfor
.endif # for-fail
Index: src/usr.bin/make/unit-tests/var-op-assign.mk
diff -u src/usr.bin/make/unit-tests/var-op-assign.mk:1.4 src/usr.bin/make/unit-tests/var-op-assign.mk:1.5
--- src/usr.bin/make/unit-tests/var-op-assign.mk:1.4 Tue Aug 25 16:20:32 2020
+++ src/usr.bin/make/unit-tests/var-op-assign.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: var-op-assign.mk,v 1.4 2020/08/25 16:20:32 rillig Exp $
+# $NetBSD: var-op-assign.mk,v 1.5 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the = variable assignment operator, which overwrites an existing
# variable or creates it.
@@ -13,7 +13,7 @@ VAR= value
# is discarded. Otherwise the value would start with a single tab.
#
.if ${VAR} != "value"
-.error
+. error
.endif
# Whitespace to the left of the assignment operator is ignored as well.
@@ -31,7 +31,7 @@ VAR =new value and \# some $$ special ch
# When a string literal appears in a condition, the escaping rules are
# different. Run make with the -dc option to see the details.
.if ${VAR} != "new value and \# some \$ special characters"
-.error ${VAR}
+. error ${VAR}
.endif
# The variable value may contain references to other variables.
@@ -71,11 +71,11 @@ VARNAME_PAREN= VAR(spaces in parentheses
VARNAME_BRACES= VAR{spaces in braces}
.if ${${VARNAME_PAREN}} != "()"
-.error
+. error
.endif
.if ${${VARNAME_BRACES}} != "{}"
-.error
+. error
.endif
# In safe mode, parsing would stop immediately after the "VARIABLE NAME="
Index: src/usr.bin/make/unit-tests/varmod-order-shuffle.mk
diff -u src/usr.bin/make/unit-tests/varmod-order-shuffle.mk:1.4 src/usr.bin/make/unit-tests/varmod-order-shuffle.mk:1.5
--- src/usr.bin/make/unit-tests/varmod-order-shuffle.mk:1.4 Sun Sep 27 20:13:44 2020
+++ src/usr.bin/make/unit-tests/varmod-order-shuffle.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-order-shuffle.mk,v 1.4 2020/09/27 20:13:44 rillig Exp $
+# $NetBSD: varmod-order-shuffle.mk,v 1.5 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the :Ox variable modifier, which returns the words of the
# variable, shuffled.
@@ -21,20 +21,20 @@ NUMBERS= one two three four five six sev
shuffled1:= ${NUMBERS:Ox}
shuffled2:= ${NUMBERS:Ox}
.if ${shuffled1} == ${shuffled2}
-.error ${shuffled1} == ${shuffled2}
+. error ${shuffled1} == ${shuffled2}
.endif
# Sorting the list before shuffling it has no effect.
shuffled1:= ${NUMBERS:O:Ox}
shuffled2:= ${NUMBERS:O:Ox}
.if ${shuffled1} == ${shuffled2}
-.error ${shuffled1} == ${shuffled2}
+. error ${shuffled1} == ${shuffled2}
.endif
# Sorting after shuffling must produce the original numbers.
sorted:= ${NUMBERS:Ox:O}
.if ${sorted} != ${NUMBERS:O}
-.error ${sorted} != ${NUMBERS:O}
+. error ${sorted} != ${NUMBERS:O}
.endif
all:
Index: src/usr.bin/make/unit-tests/varmod-order.mk
diff -u src/usr.bin/make/unit-tests/varmod-order.mk:1.4 src/usr.bin/make/unit-tests/varmod-order.mk:1.5
--- src/usr.bin/make/unit-tests/varmod-order.mk:1.4 Sun Aug 16 20:43:01 2020
+++ src/usr.bin/make/unit-tests/varmod-order.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-order.mk,v 1.4 2020/08/16 20:43:01 rillig Exp $
+# $NetBSD: varmod-order.mk,v 1.5 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the :O variable modifier, which returns the words, sorted in
# ascending order.
@@ -6,7 +6,7 @@
NUMBERS= one two three four five six seven eight nine ten
.if ${NUMBERS:O} != "eight five four nine one seven six ten three two"
-.error ${NUMBERS:O}
+. error ${NUMBERS:O}
.endif
# Unknown modifier "OX"
Index: src/usr.bin/make/unit-tests/varmod-to-upper.mk
diff -u src/usr.bin/make/unit-tests/varmod-to-upper.mk:1.4 src/usr.bin/make/unit-tests/varmod-to-upper.mk:1.5
--- src/usr.bin/make/unit-tests/varmod-to-upper.mk:1.4 Fri Aug 28 17:21:02 2020
+++ src/usr.bin/make/unit-tests/varmod-to-upper.mk Sat Oct 24 08:46:08 2020
@@ -1,18 +1,18 @@
-# $NetBSD: varmod-to-upper.mk,v 1.4 2020/08/28 17:21:02 rillig Exp $
+# $NetBSD: varmod-to-upper.mk,v 1.5 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the :tu variable modifier, which returns the words in the
# variable value, converted to uppercase.
.if ${:UUPPER:tu} != "UPPER"
-.error
+. error
.endif
.if ${:Ulower:tu} != "LOWER"
-.error
+. error
.endif
.if ${:UMixeD case.:tu} != "MIXED CASE."
-.error
+. error
.endif
# The :tu and :tl modifiers operate on the variable value as a single string,
Index: src/usr.bin/make/unit-tests/cond-op.mk
diff -u src/usr.bin/make/unit-tests/cond-op.mk:1.7 src/usr.bin/make/unit-tests/cond-op.mk:1.8
--- src/usr.bin/make/unit-tests/cond-op.mk:1.7 Fri Sep 11 05:29:46 2020
+++ src/usr.bin/make/unit-tests/cond-op.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: cond-op.mk,v 1.7 2020/09/11 05:29:46 rillig Exp $
+# $NetBSD: cond-op.mk,v 1.8 2020/10/24 08:46:08 rillig Exp $
#
# Tests for operators like &&, ||, ! in .if conditions.
#
@@ -14,24 +14,24 @@
# If || were to bind more tightly than &&, the result would be different
# as well.
.if !(1 || 1 && 0)
-.error
+. error
.endif
# If make were to interpret the && and || operators like the shell, the
# implicit binding would be this:
.if (1 || 1) && 0
-.error
+. error
.endif
# The precedence of the ! operator is different from C though. It has a
# lower precedence than the comparison operators.
.if !"word" == "word"
-.error
+. error
.endif
# This is how the above condition is actually interpreted.
.if !("word" == "word")
-.error
+. error
.endif
# TODO: Demonstrate that the precedence of the ! and == operators actually
@@ -43,14 +43,14 @@
# In any case, it is not interpreted as a negation of an unquoted string.
# See CondParser_String.
.if "!word" == !word
-.error
+. error
.endif
# Surprisingly, the ampersand and pipe are allowed in bare strings.
# That's another opportunity for writing confusing code.
# See CondParser_String, which only has '!' in the list of stop characters.
.if "a&&b||c" != a&&b||c
-.error
+. error
.endif
# As soon as the parser sees the '$', it knows that the condition will
Index: src/usr.bin/make/unit-tests/cond-short.mk
diff -u src/usr.bin/make/unit-tests/cond-short.mk:1.9 src/usr.bin/make/unit-tests/cond-short.mk:1.10
--- src/usr.bin/make/unit-tests/cond-short.mk:1.9 Wed Aug 19 22:47:09 2020
+++ src/usr.bin/make/unit-tests/cond-short.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: cond-short.mk,v 1.9 2020/08/19 22:47:09 rillig Exp $
+# $NetBSD: cond-short.mk,v 1.10 2020/10/24 08:46:08 rillig Exp $
#
# Demonstrates that in conditions, the right-hand side of an && or ||
# is only evaluated if it can actually influence the result.
@@ -76,7 +76,7 @@ VAR= # empty again, for the following te
.if 0 && ${echo.1 echo.2 echo.3:L:@i@${RAN::!=${i:C,.*,&; & 1>\&2,:S,., ,g}}@}
.endif
.if defined(FIRST) || defined(LAST) || defined(APPENDED) || defined(RAN)
-.warning first=${FIRST} last=${LAST} appended=${APPENDED} ran=${RAN}
+. warning first=${FIRST} last=${LAST} appended=${APPENDED} ran=${RAN}
.endif
# The || operator.
Index: src/usr.bin/make/unit-tests/envfirst.mk
diff -u src/usr.bin/make/unit-tests/envfirst.mk:1.2 src/usr.bin/make/unit-tests/envfirst.mk:1.3
--- src/usr.bin/make/unit-tests/envfirst.mk:1.2 Mon Jul 27 18:57:42 2020
+++ src/usr.bin/make/unit-tests/envfirst.mk Sat Oct 24 08:46:08 2020
@@ -1,41 +1,41 @@
-# $NetBSD: envfirst.mk,v 1.2 2020/07/27 18:57:42 rillig Exp $
+# $NetBSD: envfirst.mk,v 1.3 2020/10/24 08:46:08 rillig Exp $
#
# The -e option makes environment variables stronger than global variables.
.if ${FROM_ENV} != value-from-env
-.error ${FROM_ENV}
+. error ${FROM_ENV}
.endif
# Try to override the variable; this does not have any effect.
FROM_ENV= value-from-mk
.if ${FROM_ENV} != value-from-env
-.error ${FROM_ENV}
+. error ${FROM_ENV}
.endif
# Try to append to the variable; this also doesn't have any effect.
FROM_ENV+= appended
.if ${FROM_ENV} != value-from-env
-.error ${FROM_ENV}
+. error ${FROM_ENV}
.endif
# The default assignment also cannot change the variable.
FROM_ENV?= default
.if ${FROM_ENV} != value-from-env
-.error ${FROM_ENV}
+. error ${FROM_ENV}
.endif
# Neither can the assignment modifiers.
.if ${FROM_ENV::=from-condition}
.endif
.if ${FROM_ENV} != value-from-env
-.error ${FROM_ENV}
+. error ${FROM_ENV}
.endif
# Even .undef doesn't work since it only affects the global context,
# which is independent from the environment variables.
.undef FROM_ENV
.if ${FROM_ENV} != value-from-env
-.error ${FROM_ENV}
+. error ${FROM_ENV}
.endif
all:
Index: src/usr.bin/make/unit-tests/varmod-exclam-shell.mk
diff -u src/usr.bin/make/unit-tests/varmod-exclam-shell.mk:1.2 src/usr.bin/make/unit-tests/varmod-exclam-shell.mk:1.3
--- src/usr.bin/make/unit-tests/varmod-exclam-shell.mk:1.2 Sun Aug 16 12:48:55 2020
+++ src/usr.bin/make/unit-tests/varmod-exclam-shell.mk Sat Oct 24 08:46:08 2020
@@ -1,27 +1,27 @@
-# $NetBSD: varmod-exclam-shell.mk,v 1.2 2020/08/16 12:48:55 rillig Exp $
+# $NetBSD: varmod-exclam-shell.mk,v 1.3 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the :!cmd! variable modifier.
.if ${:!echo hello | tr 'l' 'l'!} != "hello"
-.warning unexpected
+. warning unexpected
.endif
# The output is truncated at the first null byte.
# Cmd_Exec returns only a string pointer without length information.
.if ${:!echo hello | tr 'l' '\0'!} != "he"
-.warning unexpected
+. warning unexpected
.endif
.if ${:!echo!} != ""
-.warning A newline at the end of the output must be stripped.
+. warning A newline at the end of the output must be stripped.
.endif
.if ${:!echo;echo!} != " "
-.warning Only a single newline at the end of the output is stripped.
+. warning Only a single newline at the end of the output is stripped.
.endif
.if ${:!echo;echo;echo;echo!} != " "
-.warning Other newlines in the output are converted to spaces.
+. warning Other newlines in the output are converted to spaces.
.endif
all:
Index: src/usr.bin/make/unit-tests/varname-dot-shell.mk
diff -u src/usr.bin/make/unit-tests/varname-dot-shell.mk:1.2 src/usr.bin/make/unit-tests/varname-dot-shell.mk:1.3
--- src/usr.bin/make/unit-tests/varname-dot-shell.mk:1.2 Sun Aug 23 09:28:52 2020
+++ src/usr.bin/make/unit-tests/varname-dot-shell.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varname-dot-shell.mk,v 1.2 2020/08/23 09:28:52 rillig Exp $
+# $NetBSD: varname-dot-shell.mk,v 1.3 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the special .SHELL variable, which contains the shell used for
# running the commands.
@@ -9,7 +9,7 @@ ORIG_SHELL:= ${.SHELL}
.SHELL= overwritten
.if ${.SHELL} != ${ORIG_SHELL}
-.error
+. error
.endif
# Trying to delete the variable.
@@ -18,7 +18,7 @@ ORIG_SHELL:= ${.SHELL}
.undef .SHELL
.SHELL= newly overwritten
.if ${.SHELL} != ${ORIG_SHELL}
-.error
+. error
.endif
all:
Index: src/usr.bin/make/unit-tests/export.mk
diff -u src/usr.bin/make/unit-tests/export.mk:1.8 src/usr.bin/make/unit-tests/export.mk:1.9
--- src/usr.bin/make/unit-tests/export.mk:1.8 Sat Oct 24 08:34:59 2020
+++ src/usr.bin/make/unit-tests/export.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: export.mk,v 1.8 2020/10/24 08:34:59 rillig Exp $
+# $NetBSD: export.mk,v 1.9 2020/10/24 08:46:08 rillig Exp $
UT_TEST=export
UT_FOO=foo${BAR}
@@ -12,7 +12,7 @@ UT_DOLLAR= This is $$UT_FU
.export UT_DOLLAR
.if !defined(.MAKE.PID)
-.error .MAKE.PID must be defined
+. error .MAKE.PID must be defined
.endif
@= at
%= percent
Index: src/usr.bin/make/unit-tests/modmisc.mk
diff -u src/usr.bin/make/unit-tests/modmisc.mk:1.47 src/usr.bin/make/unit-tests/modmisc.mk:1.48
--- src/usr.bin/make/unit-tests/modmisc.mk:1.47 Sat Oct 24 08:34:59 2020
+++ src/usr.bin/make/unit-tests/modmisc.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: modmisc.mk,v 1.47 2020/10/24 08:34:59 rillig Exp $
+# $NetBSD: modmisc.mk,v 1.48 2020/10/24 08:46:08 rillig Exp $
#
# miscellaneous modifier tests
@@ -67,18 +67,18 @@ mod-break-many-words:
# To apply a modifier indirectly via another variable, the whole
# modifier must be put into a single variable.
.if ${value:L:${:US}${:U,value,replacement,}} != "S,value,replacement,}"
-.warning unexpected
+. warning unexpected
.endif
# Adding another level of indirection (the 2 nested :U expressions) helps.
.if ${value:L:${:U${:US}${:U,value,replacement,}}} != "replacement"
-.warning unexpected
+. warning unexpected
.endif
# Multiple indirect modifiers can be applied one after another as long as
# they are separated with colons.
.if ${value:L:${:US,a,A,}:${:US,e,E,}} != "vAluE"
-.warning unexpected
+. warning unexpected
.endif
# An indirect variable that evaluates to the empty string is allowed though.
@@ -87,6 +87,6 @@ mod-break-many-words:
# M.little-endian= S,1234,4321,
# M.big-endian= # none
.if ${value:L:${:Dempty}S,a,A,} != "vAlue"
-.warning unexpected
+. warning unexpected
.endif
Index: src/usr.bin/make/unit-tests/varmisc.mk
diff -u src/usr.bin/make/unit-tests/varmisc.mk:1.24 src/usr.bin/make/unit-tests/varmisc.mk:1.25
--- src/usr.bin/make/unit-tests/varmisc.mk:1.24 Sat Oct 24 08:34:59 2020
+++ src/usr.bin/make/unit-tests/varmisc.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmisc.mk,v 1.24 2020/10/24 08:34:59 rillig Exp $
+# $NetBSD: varmisc.mk,v 1.25 2020/10/24 08:46:08 rillig Exp $
#
# Miscellaneous variable tests.
@@ -69,9 +69,9 @@ cmpv:
MAN=
MAN1= make.1
.for s in 1 2
-.if defined(MAN$s) && !empty(MAN$s)
+. if defined(MAN$s) && !empty(MAN$s)
MAN+= ${MAN$s}
-.endif
+. endif
.endfor
manok:
@@ -106,7 +106,7 @@ save-dollars:
.undef APPENDED
APPENDED+= value
.if ${APPENDED} != "value"
-.error "${APPENDED}"
+. error "${APPENDED}"
.endif
# Appending to an empty variable adds a space between the old value
@@ -114,7 +114,7 @@ APPENDED+= value
APPENDED= # empty
APPENDED+= value
.if ${APPENDED} != " value"
-.error "${APPENDED}"
+. error "${APPENDED}"
.endif
# Appending to parameterized variables works as well.
@@ -122,7 +122,7 @@ PARAM= param
VAR.${PARAM}= 1
VAR.${PARAM}+= 2
.if ${VAR.param} != "1 2"
-.error "${VAR.param}"
+. error "${VAR.param}"
.endif
# The variable name can contain arbitrary characters.
@@ -134,13 +134,13 @@ PARAM= +
VAR.${PARAM}= 1
VAR.${PARAM}+= 2
.if ${VAR.+} != "1 2"
-.error "${VAR.+}"
+. error "${VAR.+}"
.endif
.for param in + ! ?
VAR.${param}= ${param}
.endfor
.if ${VAR.+} != "+" || ${VAR.!} != "!" || ${VAR.?} != "?"
-.error "${VAR.+}" "${VAR.!}" "${VAR.?}"
+. error "${VAR.+}" "${VAR.!}" "${VAR.?}"
.endif
# Appending to a variable from the environment creates a copy of that variable
Index: src/usr.bin/make/unit-tests/varmod-defined.mk
diff -u src/usr.bin/make/unit-tests/varmod-defined.mk:1.6 src/usr.bin/make/unit-tests/varmod-defined.mk:1.7
--- src/usr.bin/make/unit-tests/varmod-defined.mk:1.6 Tue Sep 29 18:48:43 2020
+++ src/usr.bin/make/unit-tests/varmod-defined.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-defined.mk,v 1.6 2020/09/29 18:48:43 rillig Exp $
+# $NetBSD: varmod-defined.mk,v 1.7 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the :D variable modifier, which returns the given string
# if the variable is defined. It is closely related to the :U modifier.
@@ -10,7 +10,7 @@ DEF= defined
# "defined".
#
.if ${DEF:Dvalue} != "value"
-.error
+. error
.endif
# Since UNDEF is not defined, the "value" is ignored. Instead of leaving the
@@ -21,7 +21,7 @@ DEF= defined
# 2020-08-25 it is "Malformed conditional".
#
.if ${UNDEF:Dvalue} != ""
-.error
+. error
.endif
# The modifier text may contain plain text as well as expressions.
Index: src/usr.bin/make/unit-tests/varmod-l-name-to-value.mk
diff -u src/usr.bin/make/unit-tests/varmod-l-name-to-value.mk:1.6 src/usr.bin/make/unit-tests/varmod-l-name-to-value.mk:1.7
--- src/usr.bin/make/unit-tests/varmod-l-name-to-value.mk:1.6 Fri Oct 2 20:48:37 2020
+++ src/usr.bin/make/unit-tests/varmod-l-name-to-value.mk Sat Oct 24 08:46:08 2020
@@ -1,21 +1,21 @@
-# $NetBSD: varmod-l-name-to-value.mk,v 1.6 2020/10/02 20:48:37 rillig Exp $
+# $NetBSD: varmod-l-name-to-value.mk,v 1.7 2020/10/24 08:46:08 rillig Exp $
#
# Tests for the :L modifier, which returns the variable name as the new value.
# The empty variable name leads to an empty string.
.if ${:L} != ""
-.error
+. error
.endif
# The variable name is converted into an expression with the variable name
# "VARNAME" and the value "VARNAME".
.if ${VARNAME:L} != "VARNAME"
-.error
+. error
.endif
# The value of the expression can be modified afterwards.
.if ${VARNAME:L:S,VAR,,} != "NAME"
-.error
+. error
.endif
# The name of the expression is still the same as before. Using the :L
@@ -24,7 +24,7 @@
# Hmmm, this can be used as a double storage or a backup mechanism.
# Probably unintended, but maybe useful.
.if ${VARNAME:L:S,VAR,,:L} != "VARNAME"
-.error
+. error
.endif
# Between 2020-09-22 (var.c 1.527) and 2020-09-30 (var.c 1.553), there was
Index: src/usr.bin/make/unit-tests/varmod-edge.mk
diff -u src/usr.bin/make/unit-tests/varmod-edge.mk:1.12 src/usr.bin/make/unit-tests/varmod-edge.mk:1.13
--- src/usr.bin/make/unit-tests/varmod-edge.mk:1.12 Sat Aug 8 13:29:09 2020
+++ src/usr.bin/make/unit-tests/varmod-edge.mk Sat Oct 24 08:46:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-edge.mk,v 1.12 2020/08/08 13:29:09 rillig Exp $
+# $NetBSD: varmod-edge.mk,v 1.13 2020/10/24 08:46:08 rillig Exp $
#
# Tests for edge cases in variable modifiers.
#
@@ -163,9 +163,9 @@ EXP.colons= # empty
.for test in ${TESTS}
. if ${MOD.${test}} == ${EXP.${test}}
-.info ok ${test}
+. info ok ${test}
. else
-.warning error in ${test}: expected "${EXP.${test}}", got "${MOD.${test}}"
+. warning error in ${test}: expected "${EXP.${test}}", got "${MOD.${test}}"
. endif
.endfor
