Module Name: src
Committed By: rillig
Date: Mon Sep 14 07:13:29 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: cond-undef-lint.exp cond-undef-lint.mk
opt-debug-lint.exp opt-debug-lint.mk
Log Message:
make(1): remove obsolete comments from tests
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/cond-undef-lint.exp
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/cond-undef-lint.mk
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/opt-debug-lint.exp
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/opt-debug-lint.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-undef-lint.exp
diff -u src/usr.bin/make/unit-tests/cond-undef-lint.exp:1.2 src/usr.bin/make/unit-tests/cond-undef-lint.exp:1.3
--- src/usr.bin/make/unit-tests/cond-undef-lint.exp:1.2 Mon Sep 14 07:04:56 2020
+++ src/usr.bin/make/unit-tests/cond-undef-lint.exp Mon Sep 14 07:13:29 2020
@@ -1,7 +1,7 @@
-make: "cond-undef-lint.mk" line 20: Variable "UNDEF" is undefined
-make: "cond-undef-lint.mk" line 35: Variable "UNDEF" is undefined
-make: "cond-undef-lint.mk" line 35: Variable "VAR." is undefined
-make: "cond-undef-lint.mk" line 42: Variable "VAR.defined" is undefined
+make: "cond-undef-lint.mk" line 23: Variable "UNDEF" is undefined
+make: "cond-undef-lint.mk" line 38: Variable "UNDEF" is undefined
+make: "cond-undef-lint.mk" line 38: Variable "VAR." is undefined
+make: "cond-undef-lint.mk" line 45: Variable "VAR.defined" is undefined
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1
Index: src/usr.bin/make/unit-tests/cond-undef-lint.mk
diff -u src/usr.bin/make/unit-tests/cond-undef-lint.mk:1.1 src/usr.bin/make/unit-tests/cond-undef-lint.mk:1.2
--- src/usr.bin/make/unit-tests/cond-undef-lint.mk:1.1 Mon Sep 14 06:44:50 2020
+++ src/usr.bin/make/unit-tests/cond-undef-lint.mk Mon Sep 14 07:13:29 2020
@@ -1,10 +1,13 @@
-# $NetBSD: cond-undef-lint.mk,v 1.1 2020/09/14 06:44:50 rillig Exp $
+# $NetBSD: cond-undef-lint.mk,v 1.2 2020/09/14 07:13:29 rillig Exp $
#
# Tests for defined and undefined variables in .if conditions, in lint mode.
#
# As of 2020-09-14, lint mode contains experimental code for printing
# accurate error messages in case of undefined variables, instead of the
# wrong "Malformed condition".
+#
+# See also:
+# opt-debug-lint.mk
.MAKEFLAGS: -dL
@@ -60,9 +63,7 @@ INDIRECT= ${NESTED_UNDEF} ${NESTED_DEF}
NESTED_DEF= nested-defined
# Since NESTED_UNDEF is not controllable at this point, it must not generate
-# an error message. This condition should generate no error message at all.
-#
-# TODO: Suppress the error message.
+# an error message, and it doesn't do so, since 2020-09-14.
.if !${INDIRECT}
. error
.endif
Index: src/usr.bin/make/unit-tests/opt-debug-lint.exp
diff -u src/usr.bin/make/unit-tests/opt-debug-lint.exp:1.4 src/usr.bin/make/unit-tests/opt-debug-lint.exp:1.5
--- src/usr.bin/make/unit-tests/opt-debug-lint.exp:1.4 Sun Sep 13 20:21:24 2020
+++ src/usr.bin/make/unit-tests/opt-debug-lint.exp Mon Sep 14 07:13:29 2020
@@ -1,5 +1,5 @@
-make: "opt-debug-lint.mk" line 18: Variable "X" is undefined
-make: "opt-debug-lint.mk" line 40: Variable "UNDEF" is undefined
+make: "opt-debug-lint.mk" line 19: Variable "X" is undefined
+make: "opt-debug-lint.mk" line 41: Variable "UNDEF" is undefined
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1
Index: src/usr.bin/make/unit-tests/opt-debug-lint.mk
diff -u src/usr.bin/make/unit-tests/opt-debug-lint.mk:1.3 src/usr.bin/make/unit-tests/opt-debug-lint.mk:1.4
--- src/usr.bin/make/unit-tests/opt-debug-lint.mk:1.3 Sun Sep 13 20:21:24 2020
+++ src/usr.bin/make/unit-tests/opt-debug-lint.mk Mon Sep 14 07:13:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: opt-debug-lint.mk,v 1.3 2020/09/13 20:21:24 rillig Exp $
+# $NetBSD: opt-debug-lint.mk,v 1.4 2020/09/14 07:13:29 rillig Exp $
#
# Tests for the -dL command line option, which runs additional checks
# to catch common mistakes, such as unclosed variable expressions.
@@ -11,10 +11,11 @@
# misleading. The form of the condition is totally fine, it's the evaluation
# that fails.
#
-# TODO: Get rid of the "Malformed conditional" error message.
-# As long as the first error message is only printed in lint mode, it can
-# get tricky to keep track of the actually printed error messages and those
-# that still need to be printed. That's probably a solvable problem though.
+# Since 2020-09-13, the "Malformed conditional" error message is not printed
+# anymore.
+#
+# See also:
+# cond-undef-lint.mk
.if $X
. error
.endif
