From 1b65f0bd2bda7121a90f8cb4c1cacaa20f1b681d Mon Sep 17 00:00:00 2001 From: "Simon J. Gerraty" Date: Fri, 20 Nov 2020 03:54:37 +0000 Subject: Import bmake-20201117 o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable checks in InitObjdir. Explicit .OBJDIR target always allows read-only directory. o Fix building and unit-tests on non-BSD. o More code cleanup and refactoring. o More unit tests --- unit-tests/cond-token-var.exp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'unit-tests/cond-token-var.exp') diff --git a/unit-tests/cond-token-var.exp b/unit-tests/cond-token-var.exp index eb71a43c55f3..fcd92d12a3da 100644 --- a/unit-tests/cond-token-var.exp +++ b/unit-tests/cond-token-var.exp @@ -1,7 +1,7 @@ -make: "cond-token-var.mk" line 9: ok -make: "cond-token-var.mk" line 15: Malformed conditional (${UNDEF} == ${DEF}) -make: "cond-token-var.mk" line 20: Malformed conditional (${DEF} == ${UNDEF}) -make: "cond-token-var.mk" line 29: Malformed conditional (${UNDEF}) +make: "cond-token-var.mk" line 20: ok +make: "cond-token-var.mk" line 27: Malformed conditional (${UNDEF} == ${DEF}) +make: "cond-token-var.mk" line 33: Malformed conditional (${DEF} == ${UNDEF}) +make: "cond-token-var.mk" line 42: Malformed conditional (${UNDEF}) make: Fatal errors encountered -- cannot continue make: stopped in unit-tests exit status 1 -- cgit v1.2.3