Module Name: src
Committed By: rillig
Date: Fri Jan 7 19:30:18 UTC 2022
Modified Files:
src/usr.bin/make/unit-tests: cond-func.exp cond-func.mk
Log Message:
tests/make: fix documentation in cond-func.mk
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/cond-func.exp
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/make/unit-tests/cond-func.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-func.exp
diff -u src/usr.bin/make/unit-tests/cond-func.exp:1.7 src/usr.bin/make/unit-tests/cond-func.exp:1.8
--- src/usr.bin/make/unit-tests/cond-func.exp:1.7 Sun Dec 12 08:36:21 2021
+++ src/usr.bin/make/unit-tests/cond-func.exp Fri Jan 7 19:30:17 2022
@@ -2,11 +2,11 @@ make: "cond-func.mk" line 36: Missing cl
make: "cond-func.mk" line 51: Missing closing parenthesis for defined()
make: "cond-func.mk" line 54: Missing closing parenthesis for defined()
make: "cond-func.mk" line 94: The empty variable is never defined.
-make: "cond-func.mk" line 102: A plain function name is parsed as !empty(...).
-make: "cond-func.mk" line 109: A plain function name is parsed as !empty(...).
-make: "cond-func.mk" line 119: Symbols may start with a function name.
-make: "cond-func.mk" line 124: Symbols may start with a function name.
-make: "cond-func.mk" line 130: Missing closing parenthesis for defined()
+make: "cond-func.mk" line 103: A plain function name is parsed as defined(...).
+make: "cond-func.mk" line 110: A plain function name is parsed as defined(...).
+make: "cond-func.mk" line 120: Symbols may start with a function name.
+make: "cond-func.mk" line 125: Symbols may start with a function name.
+make: "cond-func.mk" line 131: Missing closing parenthesis for defined()
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1
Index: src/usr.bin/make/unit-tests/cond-func.mk
diff -u src/usr.bin/make/unit-tests/cond-func.mk:1.10 src/usr.bin/make/unit-tests/cond-func.mk:1.11
--- src/usr.bin/make/unit-tests/cond-func.mk:1.10 Tue Dec 28 22:13:56 2021
+++ src/usr.bin/make/unit-tests/cond-func.mk Fri Jan 7 19:30:17 2022
@@ -1,4 +1,4 @@
-# $NetBSD: cond-func.mk,v 1.10 2021/12/28 22:13:56 rillig Exp $
+# $NetBSD: cond-func.mk,v 1.11 2022/01/07 19:30:17 rillig Exp $
#
# Tests for those parts of the functions in .if conditions that are common
# among several functions.
@@ -94,19 +94,20 @@ ${VARNAME_UNBALANCED_BRACES}= variable n
. info The empty variable is never defined.
.endif
-# The plain word 'defined' is interpreted as '!empty(defined)'.
+# The plain word 'defined' is interpreted as 'defined(defined)', see
+# CondParser_ComparisonOrLeaf.
# That variable is not defined (yet).
.if defined
. error
.else
-. info A plain function name is parsed as !empty(...).
+. info A plain function name is parsed as defined(...).
.endif
# If a variable named 'defined' is actually defined, the bare word 'defined'
# is interpreted as 'defined(defined)', and the condition evaluates to true.
defined= # defined but empty
.if defined
-. info A plain function name is parsed as !empty(...).
+. info A plain function name is parsed as defined(...).
.else
. error
.endif
