diff options
| author | rillig <rillig@NetBSD.org> | 2023-01-19 23:26:14 +0000 |
|---|---|---|
| committer | rillig <rillig@NetBSD.org> | 2023-01-19 23:26:14 +0000 |
| commit | 6133677d26388a343213fa0843392f3d032702fc (patch) | |
| tree | 05434700f1ee6c5b78a3a1b6bddbad93acba7474 /usr.bin/make | |
| parent | 030a5551a820ffdc15a936d16e30c7cf499809a5 (diff) | |
tests/make: rename files that are not test cases
Diffstat (limited to 'usr.bin/make')
| -rw-r--r-- | usr.bin/make/unit-tests/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/include-main.exp | 16 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/include-main.mk | 4 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/include-sub.inc (renamed from usr.bin/make/unit-tests/include-sub.mk) | 4 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/include-subsub.inc | 9 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/include-subsub.mk | 9 |
6 files changed, 22 insertions, 26 deletions
diff --git a/usr.bin/make/unit-tests/Makefile b/usr.bin/make/unit-tests/Makefile index 65d1be3e1d5..6cc93548300 100644 --- a/usr.bin/make/unit-tests/Makefile +++ b/usr.bin/make/unit-tests/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.328 2023/01/19 19:55:27 rillig Exp $ +# $NetBSD: Makefile,v 1.329 2023/01/19 23:26:14 rillig Exp $ # # Unit tests for make(1) # @@ -26,10 +26,6 @@ # Any added files must also be added to src/distrib/sets/lists/tests/mi. # To do that, just run "make sync-mi" in this directory. # -# A few *.mk files are helper files for other tests (such as include-sub.mk) -# and are thus not added to TESTS. Such files must be ignored in -# src/tests/usr.bin/make/t_make.sh. -# .MAIN: all diff --git a/usr.bin/make/unit-tests/include-main.exp b/usr.bin/make/unit-tests/include-main.exp index e677826373c..f58870486f8 100644 --- a/usr.bin/make/unit-tests/include-main.exp +++ b/usr.bin/make/unit-tests/include-main.exp @@ -1,17 +1,17 @@ make: "include-main.mk" line 14: main-before-ok make: "include-main.mk" line 21: main-before-for-ok -make: "include-sub.mk" line 4: sub-before-ok -make: "include-sub.mk" line 14: sub-before-for-ok +make: "include-sub.inc" line 4: sub-before-ok +make: "include-sub.inc" line 14: sub-before-for-ok Parsing line 5: . info subsub-ok -make: "include-subsub.mk" line 5: subsub-ok - in .for loop from include-sub.mk:31 with i = include - in .for loop from include-sub.mk:30 with i = nested - in .for loop from include-sub.mk:29 with i = deeply +make: "include-subsub.inc" line 5: subsub-ok + in .for loop from include-sub.inc:31 with i = include + in .for loop from include-sub.inc:30 with i = nested + in .for loop from include-sub.inc:29 with i = deeply in include-main.mk:27 Parsing line 6: .MAKEFLAGS: -d0 ParseDependency(.MAKEFLAGS: -d0) -make: "include-sub.mk" line 38: sub-after-ok -make: "include-sub.mk" line 45: sub-after-for-ok +make: "include-sub.inc" line 38: sub-after-ok +make: "include-sub.inc" line 45: sub-after-for-ok make: "include-main.mk" line 30: main-after-ok make: "include-main.mk" line 37: main-after-for-ok exit status 0 diff --git a/usr.bin/make/unit-tests/include-main.mk b/usr.bin/make/unit-tests/include-main.mk index 9a4c6630506..50be0587348 100644 --- a/usr.bin/make/unit-tests/include-main.mk +++ b/usr.bin/make/unit-tests/include-main.mk @@ -1,4 +1,4 @@ -# $NetBSD: include-main.mk,v 1.7 2022/01/08 23:41:43 rillig Exp $ +# $NetBSD: include-main.mk,v 1.8 2023/01/19 23:26:14 rillig Exp $ # # Until 2020-09-05, the .INCLUDEDFROMFILE magic variable did not behave # as described in the manual page. @@ -24,7 +24,7 @@ . endif .endfor -.include "include-sub.mk" +.include "include-sub.inc" .if !defined(.INCLUDEDFROMFILE) . info main-after-ok diff --git a/usr.bin/make/unit-tests/include-sub.mk b/usr.bin/make/unit-tests/include-sub.inc index 57d2aafe9d1..f26f14c9d84 100644 --- a/usr.bin/make/unit-tests/include-sub.mk +++ b/usr.bin/make/unit-tests/include-sub.inc @@ -1,4 +1,4 @@ -# $NetBSD: include-sub.mk,v 1.9 2022/01/08 23:41:43 rillig Exp $ +# $NetBSD: include-sub.inc,v 1.1 2023/01/19 23:26:14 rillig Exp $ .if ${.INCLUDEDFROMFILE} == "include-main.mk" . info sub-before-ok @@ -29,7 +29,7 @@ .for i in deeply . for i in nested . for i in include -.include "include-subsub.mk" +.include "include-subsub.inc" . endfor . endfor .endfor diff --git a/usr.bin/make/unit-tests/include-subsub.inc b/usr.bin/make/unit-tests/include-subsub.inc new file mode 100644 index 00000000000..79a6a377009 --- /dev/null +++ b/usr.bin/make/unit-tests/include-subsub.inc @@ -0,0 +1,9 @@ +# $NetBSD: include-subsub.inc,v 1.1 2023/01/19 23:26:14 rillig Exp $ + +.if ${.INCLUDEDFROMFILE} == "include-sub.inc" +.MAKEFLAGS: -dp +. info subsub-ok +.MAKEFLAGS: -d0 +.else +. warning subsub-fail(${.INCLUDEDFROMFILE}) +.endif diff --git a/usr.bin/make/unit-tests/include-subsub.mk b/usr.bin/make/unit-tests/include-subsub.mk deleted file mode 100644 index 476d75f7955..00000000000 --- a/usr.bin/make/unit-tests/include-subsub.mk +++ /dev/null @@ -1,9 +0,0 @@ -# $NetBSD: include-subsub.mk,v 1.4 2021/01/26 23:44:56 rillig Exp $ - -.if ${.INCLUDEDFROMFILE} == "include-sub.mk" -.MAKEFLAGS: -dp -. info subsub-ok -.MAKEFLAGS: -d0 -.else -. warning subsub-fail(${.INCLUDEDFROMFILE}) -.endif |
