Module Name:    src
Committed By:   rillig
Date:           Mon Nov  2 20:43:27 UTC 2020

Modified Files:
        src/distrib/sets/lists/tests: mi
        src/usr.bin/make/unit-tests: Makefile
Added Files:
        src/usr.bin/make/unit-tests: cmd-errors-lint.exp cmd-errors-lint.mk

Log Message:
make(1): add test for parse errors in commands in lint mode (-dL)

The difference to non-lint mode is that the exit status is now 2 instead
of 0.


To generate a diff of this commit:
cvs rdiff -u -r1.958 -r1.959 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.184 -r1.185 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r0 -r1.1 src/usr.bin/make/unit-tests/cmd-errors-lint.exp \
    src/usr.bin/make/unit-tests/cmd-errors-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/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.958 src/distrib/sets/lists/tests/mi:1.959
--- src/distrib/sets/lists/tests/mi:1.958	Mon Nov  2 20:20:42 2020
+++ src/distrib/sets/lists/tests/mi	Mon Nov  2 20:43:27 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.958 2020/11/02 20:20:42 rillig Exp $
+# $NetBSD: mi,v 1.959 2020/11/02 20:43:27 rillig Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -4813,6 +4813,8 @@
 ./usr/tests/usr.bin/make/unit-tests/archive-suffix.mk				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/archive.exp					tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/archive.mk					tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/cmd-errors-lint.exp				tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/cmd-errors-lint.mk				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/cmd-errors.exp				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/cmd-errors.mk				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/make/unit-tests/cmd-interrupt.exp				tests-usr.bin-tests	compattestfile,atf

Index: src/usr.bin/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.184 src/usr.bin/make/unit-tests/Makefile:1.185
--- src/usr.bin/make/unit-tests/Makefile:1.184	Mon Nov  2 20:40:10 2020
+++ src/usr.bin/make/unit-tests/Makefile	Mon Nov  2 20:43:27 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.184 2020/11/02 20:40:10 rillig Exp $
+# $NetBSD: Makefile,v 1.185 2020/11/02 20:43:27 rillig Exp $
 #
 # Unit tests for make(1)
 #
@@ -38,6 +38,7 @@
 TESTS+=		archive
 TESTS+=		archive-suffix
 TESTS+=		cmd-errors
+TESTS+=		cmd-errors-lint
 TESTS+=		cmd-interrupt
 TESTS+=		cmdline
 TESTS+=		comment

Added files:

Index: src/usr.bin/make/unit-tests/cmd-errors-lint.exp
diff -u /dev/null src/usr.bin/make/unit-tests/cmd-errors-lint.exp:1.1
--- /dev/null	Mon Nov  2 20:43:27 2020
+++ src/usr.bin/make/unit-tests/cmd-errors-lint.exp	Mon Nov  2 20:43:27 2020
@@ -0,0 +1,8 @@
+: undefined 
+make: Unclosed variable "UNCLOSED"
+: unclosed-variable 
+: unclosed-modifier 
+make: Unknown modifier 'Z'
+: unknown-modifier 
+: end
+exit status 2
Index: src/usr.bin/make/unit-tests/cmd-errors-lint.mk
diff -u /dev/null src/usr.bin/make/unit-tests/cmd-errors-lint.mk:1.1
--- /dev/null	Mon Nov  2 20:43:27 2020
+++ src/usr.bin/make/unit-tests/cmd-errors-lint.mk	Mon Nov  2 20:43:27 2020
@@ -0,0 +1,32 @@
+# $NetBSD: cmd-errors-lint.mk,v 1.1 2020/11/02 20:43:27 rillig Exp $
+#
+# Demonstrate how errors in variable expansions affect whether the commands
+# are actually executed.
+
+.MAKEFLAGS: -dL
+
+all: undefined unclosed-variable unclosed-modifier unknown-modifier end
+
+# Undefined variables are not an error.  They expand to empty strings.
+undefined:
+	: $@ ${UNDEFINED}
+
+# XXX: As of 2020-11-01, this obvious syntax error is not detected.
+# XXX: As of 2020-11-01, this command is executed even though it contains
+# parse errors.
+unclosed-variable:
+	: $@ ${UNCLOSED
+
+# XXX: As of 2020-11-01, this obvious syntax error is not detected.
+# XXX: As of 2020-11-01, this command is executed even though it contains
+# parse errors.
+unclosed-modifier:
+	: $@ ${UNCLOSED:
+
+# XXX: As of 2020-11-01, this command is executed even though it contains
+# parse errors.
+unknown-modifier:
+	: $@ ${UNKNOWN:Z}
+
+end:
+	: $@

Reply via email to