Module Name: src
Committed By: rillig
Date: Fri Oct 23 14:38:39 UTC 2020
Modified Files:
src/usr.bin/make/unit-tests: Makefile varmod-ifelse.exp
Log Message:
make(1): move tests from cond2.mk to varmod-ifelse.mk (fixup)
To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/varmod-ifelse.exp
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/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.170 src/usr.bin/make/unit-tests/Makefile:1.171
--- src/usr.bin/make/unit-tests/Makefile:1.170 Fri Oct 23 06:18:23 2020
+++ src/usr.bin/make/unit-tests/Makefile Fri Oct 23 14:38:39 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.170 2020/10/23 06:18:23 rillig Exp $
+# $NetBSD: Makefile,v 1.171 2020/10/23 14:38:39 rillig Exp $
#
# Unit tests for make(1)
#
@@ -69,7 +69,6 @@ TESTS+= cond-token-string
TESTS+= cond-token-var
TESTS+= cond-undef-lint
TESTS+= cond1
-TESTS+= cond2
TESTS+= counter
TESTS+= counter-append
TESTS+= dep
Index: src/usr.bin/make/unit-tests/varmod-ifelse.exp
diff -u src/usr.bin/make/unit-tests/varmod-ifelse.exp:1.2 src/usr.bin/make/unit-tests/varmod-ifelse.exp:1.3
--- src/usr.bin/make/unit-tests/varmod-ifelse.exp:1.2 Fri Oct 23 14:24:51 2020
+++ src/usr.bin/make/unit-tests/varmod-ifelse.exp Fri Oct 23 14:38:39 2020
@@ -1,6 +1,8 @@
make: Bad conditional expression `variable expression == "literal"' in variable expression == "literal"?bad:bad
-make: "varmod-ifelse.mk" line 28: Malformed conditional (${${:Uvariable expression} == "literal":?bad:bad})
-make: Bad conditional expression ` == ""' in == ""?oops:oops
+make: "varmod-ifelse.mk" line 27: Malformed conditional (${${:Uvariable expression} == "literal":?bad:bad})
+make: Bad conditional expression ` == ""' in == ""?bad-assign:bad-assign
+make: Bad conditional expression ` == ""' in == ""?bad-cond:bad-cond
+make: "varmod-ifelse.mk" line 44: Malformed conditional (${${UNDEF} == "":?bad-cond:bad-cond})
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1
