diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2021-01-14 06:21:37 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2021-01-14 06:21:37 +0000 |
| commit | 06b9b3e0ad0dc3f0166b3e8f26ced68c271cf527 (patch) | |
| tree | 92a02f1874a5dacc12b39edd184602d24888baad /contrib/bmake/unit-tests/directive-else.exp | |
| parent | 0495ed398c4f64013bab2327eb13a303e1f90c13 (diff) | |
| parent | 8e11a9b4250be3c3379c45fa820bff78d99d5946 (diff) | |
| download | src-06b9b3e0ad0dc3f0166b3e8f26ced68c271cf527.tar.gz src-06b9b3e0ad0dc3f0166b3e8f26ced68c271cf527.zip | |
Merge bmake-20210110
Quite a lot of churn on style, but lots of
good work refactoring complicated functions
and lots more unit-tests.
Thanks mostly to rillig at NetBSD
Some interesting entries from ChangeLog
o .MAKE.{UID,GID} represent uid and gid running make.
o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
checks in InitObjdir. Explicit .OBJDIR target always allows
read-only directory.
o add more unit tests for META MODE
Merge commit '8e11a9b4250be3c3379c45fa820bff78d99d5946' into main
Change-Id: I464fd4c013067f0915671c1ccc96d2d8090b2b9c
Diffstat (limited to 'contrib/bmake/unit-tests/directive-else.exp')
| -rw-r--r-- | contrib/bmake/unit-tests/directive-else.exp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/contrib/bmake/unit-tests/directive-else.exp b/contrib/bmake/unit-tests/directive-else.exp index ca60595745a9..138e893ffa88 100644 --- a/contrib/bmake/unit-tests/directive-else.exp +++ b/contrib/bmake/unit-tests/directive-else.exp @@ -1,11 +1,11 @@ -make: "directive-else.mk" line 11: The .else directive does not take arguments. -make: "directive-else.mk" line 12: ok -make: "directive-else.mk" line 16: ok -make: "directive-else.mk" line 17: The .else directive does not take arguments. -make: "directive-else.mk" line 22: if-less else -make: "directive-else.mk" line 28: ok -make: "directive-else.mk" line 29: warning: extra else -make: "directive-else.mk" line 42: The .else directive does not take arguments. +make: "directive-else.mk" line 14: The .else directive does not take arguments. +make: "directive-else.mk" line 15: ok +make: "directive-else.mk" line 19: ok +make: "directive-else.mk" line 21: The .else directive does not take arguments. +make: "directive-else.mk" line 26: if-less else +make: "directive-else.mk" line 32: ok +make: "directive-else.mk" line 33: warning: extra else +make: "directive-else.mk" line 45: The .else directive does not take arguments. make: Fatal errors encountered -- cannot continue make: stopped in unit-tests exit status 1 |