Module Name: src
Committed By: rillig
Date: Sat Dec 19 16:00:17 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: directive-for-null.exp
directive-for-null.mk
Log Message:
make(1): add test for null byte in .for loop body
To generate a diff of this commit:
cvs rdiff -u -r1.995 -r1.996 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.251 -r1.252 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r0 -r1.1 src/usr.bin/make/unit-tests/directive-for-null.exp \
src/usr.bin/make/unit-tests/directive-for-null.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.995 src/distrib/sets/lists/tests/mi:1.996
--- src/distrib/sets/lists/tests/mi:1.995 Sat Dec 19 12:14:59 2020
+++ src/distrib/sets/lists/tests/mi Sat Dec 19 16:00:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.995 2020/12/19 12:14:59 rillig Exp $
+# $NetBSD: mi,v 1.996 2020/12/19 16:00:17 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5056,6 +5056,8 @@
./usr/tests/usr.bin/make/unit-tests/directive-for-generating-endif.mk tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/directive-for-lines.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/directive-for-lines.mk tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/directive-for-null.exp tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/directive-for-null.mk tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/directive-for.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/directive-for.mk tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/directive-hyphen-include.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.251 src/usr.bin/make/unit-tests/Makefile:1.252
--- src/usr.bin/make/unit-tests/Makefile:1.251 Sat Dec 19 12:14:59 2020
+++ src/usr.bin/make/unit-tests/Makefile Sat Dec 19 16:00:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.251 2020/12/19 12:14:59 rillig Exp $
+# $NetBSD: Makefile,v 1.252 2020/12/19 16:00:17 rillig Exp $
#
# Unit tests for make(1)
#
@@ -160,6 +160,7 @@ TESTS+= directive-export-literal
TESTS+= directive-for
TESTS+= directive-for-generating-endif
TESTS+= directive-for-lines
+TESTS+= directive-for-null
TESTS+= directive-hyphen-include
TESTS+= directive-if
TESTS+= directive-if-nested
Added files:
Index: src/usr.bin/make/unit-tests/directive-for-null.exp
diff -u /dev/null src/usr.bin/make/unit-tests/directive-for-null.exp:1.1
--- /dev/null Sat Dec 19 16:00:17 2020
+++ src/usr.bin/make/unit-tests/directive-for-null.exp Sat Dec 19 16:00:17 2020
@@ -0,0 +1,10 @@
+make: "(stdin)" line 2: Zero byte read from file
+make: "(stdin)" line 2: Unexpected end of file in for loop.
+make: "(stdin)" line 3: Zero byte read from file
+make: Fatal errors encountered -- cannot continue
+make: stopped in unit-tests
+*** Error code 1 (continuing)
+
+Stop.
+make: stopped in unit-tests
+exit status 1
Index: src/usr.bin/make/unit-tests/directive-for-null.mk
diff -u /dev/null src/usr.bin/make/unit-tests/directive-for-null.mk:1.1
--- /dev/null Sat Dec 19 16:00:17 2020
+++ src/usr.bin/make/unit-tests/directive-for-null.mk Sat Dec 19 16:00:17 2020
@@ -0,0 +1,19 @@
+# $NetBSD: directive-for-null.mk,v 1.1 2020/12/19 16:00:17 rillig Exp $
+#
+# Test for parsing a .for loop that accidentally contains a null byte.
+#
+# As of 2020-12-19, there are 3 error messages:
+#
+# make: "(stdin)" line 2: Zero byte read from file
+# make: "(stdin)" line 2: Unexpected end of file in for loop.
+# make: "(stdin)" line 3: Zero byte read from file
+#
+# The one about "end of file" might be misleading but is due to the
+# implementation. On both errors and EOF, ParseGetLine returns NULL.
+#
+# The one about the "zero byte" in line 3 is surprising since the only
+# line that contains a null byte is line 2.
+
+all: .PHONY
+ @printf '%s\n' '.for i in 1 2 3' 'VAR=value' '.endfor' | tr 'l' '\0' \
+ | ${MAKE} -f -
