Module Name: src
Committed By: sjg
Date: Mon Oct 12 17:09:29 UTC 2015
Modified Files:
src/usr.bin/make/unit-tests: varmisc.exp varmisc.mk
Log Message:
Add unit-test for discarded :?
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/varmisc.exp
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/varmisc.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/varmisc.exp
diff -u src/usr.bin/make/unit-tests/varmisc.exp:1.3 src/usr.bin/make/unit-tests/varmisc.exp:1.4
--- src/usr.bin/make/unit-tests/varmisc.exp:1.3 Sun Oct 11 06:32:15 2015
+++ src/usr.bin/make/unit-tests/varmisc.exp Mon Oct 12 17:09:29 2015
@@ -15,4 +15,6 @@ TRUE
:? only rhs when value false
false
FALSE
+do not evaluate or expand :? if discarding
+is set
exit status 0
Index: src/usr.bin/make/unit-tests/varmisc.mk
diff -u src/usr.bin/make/unit-tests/varmisc.mk:1.4 src/usr.bin/make/unit-tests/varmisc.mk:1.5
--- src/usr.bin/make/unit-tests/varmisc.mk:1.4 Sun Oct 11 06:32:15 2015
+++ src/usr.bin/make/unit-tests/varmisc.mk Mon Oct 12 17:09:29 2015
@@ -1,8 +1,8 @@
-# $Id: varmisc.mk,v 1.4 2015/10/11 06:32:15 sjg Exp $
+# $Id: varmisc.mk,v 1.5 2015/10/12 17:09:29 sjg Exp $
#
# Miscellaneous variable tests.
-all: unmatched_var_paren D_true U_true D_false U_false Q_lhs Q_rhs
+all: unmatched_var_paren D_true U_true D_false U_false Q_lhs Q_rhs NQ_none
unmatched_var_paren:
@echo ${foo::=foo-text}
@@ -36,3 +36,7 @@ Q_lhs:
Q_rhs:
@echo :? only rhs when value false
@echo ${0:L:?${True}:${False}}
+
+NQ_none:
+ @echo do not evaluate or expand :? if discarding
+ @echo ${VSET:U${1:L:?${True}:${False}}}
