Wed Jan 26 22:19:25 2022 UTC ()
tests/make: remove unnecessary conditional processing for meta test

The .if/.else distracted from the main topic of the test and made it too
hard to see the main targets.


(rillig)
diff -r1.4 -r1.5 src/usr.bin/make/unit-tests/depsrc-meta.mk
cvs diff -r1.4 -r1.5 src/usr.bin/make/unit-tests/depsrc-meta.mk (expand / switch to unified diff)

--- src/usr.bin/make/unit-tests/depsrc-meta.mk 2020/11/27 08:39:07 1.4
+++ src/usr.bin/make/unit-tests/depsrc-meta.mk 2022/01/26 22:19:25 1.5
@@ -1,31 +1,27 @@ @@ -1,31 +1,27 @@
1# $NetBSD: depsrc-meta.mk,v 1.4 2020/11/27 08:39:07 rillig Exp $ 1# $NetBSD: depsrc-meta.mk,v 1.5 2022/01/26 22:19:25 rillig Exp $
2# 2#
3# Tests for the special source .META in dependency declarations. 3# Tests for the special source .META in dependency declarations.
4 4
5# TODO: Implementation 5# TODO: Implementation
6# TODO: Explanation 6# TODO: Explanation
7 7
8.if make(actual-test) 8.MAIN: all
9 9
 10.if make(actual-test)
10.MAKEFLAGS: -dM 11.MAKEFLAGS: -dM
11.MAKE.MODE= meta curDirOk=true 12.MAKE.MODE= meta curDirOk=true
 13.endif
12 14
13actual-test: depsrc-meta-target 15actual-test: depsrc-meta-target
14depsrc-meta-target: .META 16depsrc-meta-target: .META
15 @> ${.TARGET}-file 17 @> ${.TARGET}-file
16 @rm -f ${.TARGET}-file 18 @rm -f ${.TARGET}-file
17 19
18.elif make(check-results) 
19 
20check-results: 20check-results:
21 @echo 'Targets from meta mode:' 21 @echo 'Targets from meta mode:'
22 @awk '/^TARGET/ { print "| " $$0 }' depsrc-meta-target.meta 22 @awk '/^TARGET/ { print "| " $$0 }' depsrc-meta-target.meta
23 @rm depsrc-meta-target.meta 23 @rm depsrc-meta-target.meta
24 24
25.else 
26 
27all: 25all:
28 @${MAKE} -f ${MAKEFILE} actual-test 26 @${MAKE} -f ${MAKEFILE} actual-test
29 @${MAKE} -f ${MAKEFILE} check-results 27 @${MAKE} -f ${MAKEFILE} check-results
30 
31.endif