Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/make/unit-tests make(1): move tests from cond2.mk to...
details: https://anonhg.NetBSD.org/src/rev/618e7dc2ee2b
branches: trunk
changeset: 1015422:618e7dc2ee2b
user: rillig <rillig%NetBSD.org@localhost>
date: Fri Oct 23 14:38:39 2020 +0000
description:
make(1): move tests from cond2.mk to varmod-ifelse.mk (fixup)
diffstat:
usr.bin/make/unit-tests/Makefile | 3 +--
usr.bin/make/unit-tests/varmod-ifelse.exp | 6 ++++--
2 files changed, 5 insertions(+), 4 deletions(-)
diffs (31 lines):
diff -r ab2739708d5e -r 618e7dc2ee2b usr.bin/make/unit-tests/Makefile
--- a/usr.bin/make/unit-tests/Makefile Fri Oct 23 14:24:51 2020 +0000
+++ b/usr.bin/make/unit-tests/Makefile Fri Oct 23 14:38:39 2020 +0000
@@ -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-var
TESTS+= cond-undef-lint
TESTS+= cond1
-TESTS+= cond2
TESTS+= counter
TESTS+= counter-append
TESTS+= dep
diff -r ab2739708d5e -r 618e7dc2ee2b usr.bin/make/unit-tests/varmod-ifelse.exp
--- a/usr.bin/make/unit-tests/varmod-ifelse.exp Fri Oct 23 14:24:51 2020 +0000
+++ b/usr.bin/make/unit-tests/varmod-ifelse.exp Fri Oct 23 14:38:39 2020 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index