Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make(1): move test for missing space after .if to correct file

This commit is contained in:
rillig 2020-11-12 19:46:36 +00:00
parent 4890da5730
commit d0d92c5376
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.bin/make/unit-tests/directive-elif.exp
View File

@ -12,9 +12,6 @@ make: "directive-elif.mk" line 57: Unknown directive "elsif"
make: "directive-elif.mk" line 58: 2-elsif
make: "directive-elif.mk" line 64: if-less elif
make: "directive-elif.mk" line 69: warning: extra elif
make: "directive-elif.mk" line 75: Don't do this, always put a space after a directive.
make: "directive-elif.mk" line 79: Don't do this, always put a space after a directive.
make: "directive-elif.mk" line 85: Don't do this, always put a space around comparison operators.
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1

20
usr.bin/make/unit-tests/directive-elif.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: directive-elif.mk,v 1.5 2020/11/12 19:45:24 rillig Exp $
# $NetBSD: directive-elif.mk,v 1.6 2020/11/12 19:46:36 rillig Exp $
#
# Tests for the .elif directive.
@ -69,22 +69,4 @@
.elif
.endif
.if0
. error
.else
. info Don't do this, always put a space after a directive.
.endif
.if${:U-3}
. info Don't do this, always put a space after a directive.
.else
. error
.endif
.if${:U-3}>-4
. info Don't do this, always put a space around comparison operators.
.else
. error
.endif
all:

3
usr.bin/make/unit-tests/directive-if.exp
View File

@ -7,6 +7,9 @@ make: "directive-if.mk" line 40: Unknown directive "error"
make: "directive-if.mk" line 41: if-less endif
make: "directive-if.mk" line 44: Malformed conditional ()
make: "directive-if.mk" line 54: Quotes in plain words are probably a mistake.
make: "directive-if.mk" line 63: Don't do this, always put a space after a directive.
make: "directive-if.mk" line 67: Don't do this, always put a space after a directive.
make: "directive-if.mk" line 73: Don't do this, always put a space around comparison operators.
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1

20
usr.bin/make/unit-tests/directive-if.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: directive-if.mk,v 1.5 2020/11/10 22:23:37 rillig Exp $
# $NetBSD: directive-if.mk,v 1.6 2020/11/12 19:46:36 rillig Exp $
#
# Tests for the .if directive.
@ -57,4 +57,22 @@
. error
.endif
.if0
. error
.else
. info Don't do this, always put a space after a directive.
.endif
.if${:U-3}
. info Don't do this, always put a space after a directive.
.else
. error
.endif
.if${:U-3}>-4
. info Don't do this, always put a space around comparison operators.
.else
. error
.endif
all: