Module Name: src
Committed By: rillig
Date: Thu Jul 2 12:37:18 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: cond-short.exp cond-short.mk
Log Message:
make(1): demonstrate another unintended variable evaluation
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/cond-short.exp
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/cond-short.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-short.exp
diff -u src/usr.bin/make/unit-tests/cond-short.exp:1.4 src/usr.bin/make/unit-tests/cond-short.exp:1.5
--- src/usr.bin/make/unit-tests/cond-short.exp:1.4 Thu Jul 2 12:34:30 2020
+++ src/usr.bin/make/unit-tests/cond-short.exp Thu Jul 2 12:37:18 2020
@@ -3,6 +3,7 @@ expected and exists
expected and empty
expected U23 condition
expected VAR23
+unexpected M pattern
expected or
expected or exists
expected or empty
Index: src/usr.bin/make/unit-tests/cond-short.mk
diff -u src/usr.bin/make/unit-tests/cond-short.mk:1.3 src/usr.bin/make/unit-tests/cond-short.mk:1.4
--- src/usr.bin/make/unit-tests/cond-short.mk:1.3 Thu Jul 2 10:36:58 2020
+++ src/usr.bin/make/unit-tests/cond-short.mk Thu Jul 2 12:37:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: cond-short.mk,v 1.3 2020/07/02 10:36:58 rillig Exp $
+# $NetBSD: cond-short.mk,v 1.4 2020/07/02 12:37:18 rillig Exp $
#
# Demonstrates that in conditions, the right-hand side of an && or ||
# is only evaluated if it can actually influence the result.
@@ -27,8 +27,8 @@
.if 1 && empty(${echo "expected and empty" 1>&2 :L:sh})
.endif
-# FIXME: "VAR U11" must not be evaluated.
-# The whole !empty condition must only be parsed and then discarded.
+# "VAR U11" is not evaluated; it was evaluated before 2020-07-02.
+# The whole !empty condition is only parsed and then discarded.
VAR= ${VAR${:U11${echo "unexpected VAR U11" 1>&2 :L:sh}}}
VAR13= ${VAR${:U12${echo "unexpected VAR13" 1>&2 :L:sh}}}
.if 0 && !empty(VAR${:U13${echo "unexpected U13 condition" 1>&2 :L:sh}})
@@ -39,6 +39,10 @@ VAR23= ${VAR${:U22${echo "expected VAR
.if 1 && !empty(VAR${:U23${echo "expected U23 condition" 1>&2 :L:sh}})
.endif
+# FIXME: The :M modifier must only be parsed, not evaluated.
+.if 0 && !empty(VAR:M${:U${echo "unexpected M pattern" 1>&2 :L:sh}})
+.endif
+
# The || operator.
.if 1 || ${echo "unexpected or" 1>&2 :L:sh}
