Module Name: src
Committed By: rillig
Date: Sun Jul 26 22:15:36 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: varparse-dynamic.exp varparse-dynamic.mk
Log Message:
make(1): add test for off-by-one error in Var_Parse
To generate a diff of this commit:
cvs rdiff -u -r1.877 -r1.878 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.65 -r1.66 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r0 -r1.1 src/usr.bin/make/unit-tests/varparse-dynamic.exp \
src/usr.bin/make/unit-tests/varparse-dynamic.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.877 src/distrib/sets/lists/tests/mi:1.878
--- src/distrib/sets/lists/tests/mi:1.877 Sun Jul 26 14:22:22 2020
+++ src/distrib/sets/lists/tests/mi Sun Jul 26 22:15:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.877 2020/07/26 14:22:22 riastradh Exp $
+# $NetBSD: mi,v 1.878 2020/07/26 22:15:36 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -4608,6 +4608,8 @@
./usr/tests/usr.bin/make/unit-tests/varmisc.mk tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/varmod-edge.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/varmod-edge.mk tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/varparse-dynamic.exp tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/make/unit-tests/varparse-dynamic.mk tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/varquote.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/varquote.mk tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/make/unit-tests/varshell.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.65 src/usr.bin/make/unit-tests/Makefile:1.66
--- src/usr.bin/make/unit-tests/Makefile:1.65 Sun Jul 26 11:10:29 2020
+++ src/usr.bin/make/unit-tests/Makefile Sun Jul 26 22:15:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2020/07/26 11:10:29 rillig Exp $
+# $NetBSD: Makefile,v 1.66 2020/07/26 22:15:36 rillig Exp $
#
# Unit tests for make(1)
#
@@ -72,6 +72,7 @@ TESTS+= vardebug
TESTS+= varfind
TESTS+= varmisc
TESTS+= varmod-edge
+TESTS+= varparse-dynamic
TESTS+= varquote
TESTS+= varshell
Added files:
Index: src/usr.bin/make/unit-tests/varparse-dynamic.exp
diff -u /dev/null src/usr.bin/make/unit-tests/varparse-dynamic.exp:1.1
--- /dev/null Sun Jul 26 22:15:36 2020
+++ src/usr.bin/make/unit-tests/varparse-dynamic.exp Sun Jul 26 22:15:36 2020
@@ -0,0 +1,4 @@
+make: "varparse-dynamic.mk" line 10: Malformed conditional (${.TARGXX})
+make: Fatal errors encountered -- cannot continue
+make: stopped in unit-tests
+exit status 1
Index: src/usr.bin/make/unit-tests/varparse-dynamic.mk
diff -u /dev/null src/usr.bin/make/unit-tests/varparse-dynamic.mk:1.1
--- /dev/null Sun Jul 26 22:15:36 2020
+++ src/usr.bin/make/unit-tests/varparse-dynamic.mk Sun Jul 26 22:15:36 2020
@@ -0,0 +1,14 @@
+# $NetBSD: varparse-dynamic.mk,v 1.1 2020/07/26 22:15:36 rillig Exp $
+
+# Before 2020-07-27, there was an off-by-one error in Var_Parse that skipped
+# the last character in the variable name.
+# To trigger the bug, the variable must not be defined.
+.if ${.TARGET} # exact match, may be undefined
+.endif
+.if ${.TARGEX} # 1 character difference, must be defined
+.endif
+.if ${.TARGXX} # 2 characters difference, must be defined
+.endif
+
+all:
+ @:
