Module Name: src
Committed By: sjg
Date: Sun Oct 11 06:32:15 UTC 2015
Modified Files:
src/usr.bin/make/unit-tests: varmisc.exp varmisc.mk
Log Message:
Avoid echo -n in unit-tests
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/varmisc.exp
cvs rdiff -u -r1.3 -r1.4 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.2 src/usr.bin/make/unit-tests/varmisc.exp:1.3
--- src/usr.bin/make/unit-tests/varmisc.exp:1.2 Sun Oct 11 04:51:24 2015
+++ src/usr.bin/make/unit-tests/varmisc.exp Sun Oct 11 06:32:15 2015
@@ -1,14 +1,18 @@
:D expanded when var set
-true,TRUE
+true
+TRUE
:U expanded when var undef
-true,TRUE
+true
+TRUE
:D skipped if var undef
:U skipped when var set
is set
:? only lhs when value true
-true,TRUE
+true
+TRUE
:? only rhs when value false
-false,FALSE
+false
+FALSE
exit status 0
Index: src/usr.bin/make/unit-tests/varmisc.mk
diff -u src/usr.bin/make/unit-tests/varmisc.mk:1.3 src/usr.bin/make/unit-tests/varmisc.mk:1.4
--- src/usr.bin/make/unit-tests/varmisc.mk:1.3 Sun Oct 11 04:51:24 2015
+++ src/usr.bin/make/unit-tests/varmisc.mk Sun Oct 11 06:32:15 2015
@@ -1,4 +1,4 @@
-# $Id: varmisc.mk,v 1.3 2015/10/11 04:51:24 sjg Exp $
+# $Id: varmisc.mk,v 1.4 2015/10/11 06:32:15 sjg Exp $
#
# Miscellaneous variable tests.
@@ -7,8 +7,8 @@ all: unmatched_var_paren D_true U_true D
unmatched_var_paren:
@echo ${foo::=foo-text}
-True = ${echo -n true,>&2:L:sh}TRUE
-False= ${echo -n false,>&2:L:sh}FALSE
+True = ${echo true >&2:L:sh}TRUE
+False= ${echo false >&2:L:sh}FALSE
VSET= is set
.undef UNDEF
