diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2020-11-20 03:54:37 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2020-11-20 03:54:37 +0000 |
| commit | 1b65f0bd2bda7121a90f8cb4c1cacaa20f1b681d (patch) | |
| tree | 90c374b8513ec5109e1ec4e2228e2edf648e8756 /unit-tests/cond-token-var.exp | |
| parent | 302da1a3d35c15cb29d76e0a939f8bcb13f7ad80 (diff) | |
Import bmake-20201117vendor/NetBSD/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
Notes
Notes:
svn path=/vendor/NetBSD/bmake/dist/; revision=367860
svn path=/vendor/NetBSD/bmake/20201117/; revision=367861; tag=vendor/NetBSD/bmake/20201117
Diffstat (limited to 'unit-tests/cond-token-var.exp')
| -rw-r--r-- | unit-tests/cond-token-var.exp | 8 |
1 files changed, 4 insertions, 4 deletions
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 |