Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make/unit-tests tests/make: fix documentation in con...



details:   https://anonhg.NetBSD.org/src/rev/8173ed6222b0
branches:  trunk
changeset: 359487:8173ed6222b0
user:      rillig <rillig%NetBSD.org@localhost>
date:      Fri Jan 07 19:30:17 2022 +0000

description:
tests/make: fix documentation in cond-func.mk

diffstat:

 usr.bin/make/unit-tests/cond-func.exp |  10 +++++-----
 usr.bin/make/unit-tests/cond-func.mk  |   9 +++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diffs (53 lines):

diff -r 8b64bcb12f76 -r 8173ed6222b0 usr.bin/make/unit-tests/cond-func.exp
--- a/usr.bin/make/unit-tests/cond-func.exp     Fri Jan 07 19:24:27 2022 +0000
+++ b/usr.bin/make/unit-tests/cond-func.exp     Fri Jan 07 19:30:17 2022 +0000
@@ -2,11 +2,11 @@
 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
diff -r 8b64bcb12f76 -r 8173ed6222b0 usr.bin/make/unit-tests/cond-func.mk
--- a/usr.bin/make/unit-tests/cond-func.mk      Fri Jan 07 19:24:27 2022 +0000
+++ b/usr.bin/make/unit-tests/cond-func.mk      Fri Jan 07 19:30:17 2022 +0000
@@ -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 @@
 .  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



Home | Main Index | Thread Index | Old Index