[src/trunk]: src/usr.bin/make/unit-tests make(1): move test for missing space...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/72869ddd3e7d
branches:  trunk
changeset: 978190:72869ddd3e7d
user:      rillig <rillig%NetBSD.org@localhost>
date:      Thu Nov 12 19:46:36 2020 +0000

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

diffstat:

 usr.bin/make/unit-tests/directive-elif.exp |   3 ---
 usr.bin/make/unit-tests/directive-elif.mk  |  20 +-------------------
 usr.bin/make/unit-tests/directive-if.exp   |   3 +++
 usr.bin/make/unit-tests/directive-if.mk    |  20 +++++++++++++++++++-
 4 files changed, 23 insertions(+), 23 deletions(-)

diffs (90 lines):

diff -r b8ee0c54419f -r 72869ddd3e7d usr.bin/make/unit-tests/directive-elif.exp
--- a/usr.bin/make/unit-tests/directive-elif.exp        Thu Nov 12 19:45:24 2020 +0000
+++ b/usr.bin/make/unit-tests/directive-elif.exp        Thu Nov 12 19:46:36 2020 +0000
@@ -12,9 +12,6 @@
 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
diff -r b8ee0c54419f -r 72869ddd3e7d usr.bin/make/unit-tests/directive-elif.mk
--- a/usr.bin/make/unit-tests/directive-elif.mk Thu Nov 12 19:45:24 2020 +0000
+++ b/usr.bin/make/unit-tests/directive-elif.mk Thu Nov 12 19:46:36 2020 +0000
@@ -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:
diff -r b8ee0c54419f -r 72869ddd3e7d usr.bin/make/unit-tests/directive-if.exp
--- a/usr.bin/make/unit-tests/directive-if.exp  Thu Nov 12 19:45:24 2020 +0000
+++ b/usr.bin/make/unit-tests/directive-if.exp  Thu Nov 12 19:46:36 2020 +0000
@@ -7,6 +7,9 @@
 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
diff -r b8ee0c54419f -r 72869ddd3e7d usr.bin/make/unit-tests/directive-if.mk
--- a/usr.bin/make/unit-tests/directive-if.mk   Thu Nov 12 19:45:24 2020 +0000
+++ b/usr.bin/make/unit-tests/directive-if.mk   Thu Nov 12 19:46:36 2020 +0000
@@ -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: