diff options
author | Simon J. Gerraty <sjg@FreeBSD.org> | 2023-06-27 20:29:43 +0000 |
---|---|---|
committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2023-06-27 20:29:43 +0000 |
commit | 3e39ce563b9ba25883e5aa37d9799eda9e57c1e0 (patch) | |
tree | b01c5a81afb41e56ff12c7b6995716a14d00767b /unit-tests/cond-token-var.exp | |
parent | 945078deae448e0a13c34b3393d836087719fb16 (diff) | |
download | src-3e39ce563b9ba25883e5aa37d9799eda9e57c1e0.tar.gz src-3e39ce563b9ba25883e5aa37d9799eda9e57c1e0.zip |
Import bmake-20230622vendor/NetBSD/bmake/20230622
Relevant/interesting changes:
o optimize string matching for ':M' and ':N'
o warn about malformed patterns in ':M', ':N' and '.if make(...)'
o allow guards to be targets as well as variables
The guard targets may include variable references like
__${.PARSEDIR:tA}/${.PARSEFILE}__
o optimization for makefiles protected from multiple-inclusion
skip even opening the file after first include.
o var.c: do not allow delete of readOnly variable
o parse.c: .break takes no args
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 fcd92d12a3da..d84ca56e981b 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 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: "cond-token-var.mk" line 21: ok +make: "cond-token-var.mk" line 28: Malformed conditional (${UNDEF} == ${DEF}) +make: "cond-token-var.mk" line 34: Malformed conditional (${DEF} == ${UNDEF}) +make: "cond-token-var.mk" line 44: Malformed conditional (${UNDEF}) make: Fatal errors encountered -- cannot continue make: stopped in unit-tests exit status 1 |