Wed Mar 2 19:32:16 2022 UTC ()
Add nofilemon to meta mode tests

The unit-tests for meta mode do not depend on filemon.
Adding nofilemon to .MAKE.MODE allows these to pass on
a system that would use filemon_dev but does not have
the module loaded.


(sjg)
diff -r1.6 -r1.7 src/usr.bin/make/unit-tests/depsrc-meta.mk
diff -r1.5 -r1.6 src/usr.bin/make/unit-tests/meta-cmd-cmp.mk
cvs diff -r1.6 -r1.7 src/usr.bin/make/unit-tests/depsrc-meta.mk (expand / switch to unified diff)

--- src/usr.bin/make/unit-tests/depsrc-meta.mk 2022/01/26 22:47:03 1.6
+++ src/usr.bin/make/unit-tests/depsrc-meta.mk 2022/03/02 19:32:15 1.7
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: depsrc-meta.mk,v 1.6 2022/01/26 22:47:03 rillig Exp $ 1# $NetBSD: depsrc-meta.mk,v 1.7 2022/03/02 19:32:15 sjg 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.MAIN: all 8.MAIN: all
9 9
10.if make(actual-test) 10.if make(actual-test)
11.MAKEFLAGS: -dM 11.MAKEFLAGS: -dM
12.MAKE.MODE= meta curDirOk=true 12.MAKE.MODE= meta curDirOk=true nofilemon
13.endif 13.endif
14 14
15actual-test: depsrc-meta-target 15actual-test: depsrc-meta-target
16depsrc-meta-target: .META 16depsrc-meta-target: .META
17 @> ${.TARGET}-file 17 @> ${.TARGET}-file
18 @rm -f ${.TARGET}-file 18 @rm -f ${.TARGET}-file
19 19
20check-results: 20check-results:
21 @echo 'Targets from meta mode${.MAKE.JOBS:D in jobs mode}:' 21 @echo 'Targets from meta mode${.MAKE.JOBS:D in jobs 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
25all: 25all:
cvs diff -r1.5 -r1.6 src/usr.bin/make/unit-tests/meta-cmd-cmp.mk (expand / switch to unified diff)

--- src/usr.bin/make/unit-tests/meta-cmd-cmp.mk 2022/02/09 21:09:24 1.5
+++ src/usr.bin/make/unit-tests/meta-cmd-cmp.mk 2022/03/02 19:32:15 1.6
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: meta-cmd-cmp.mk,v 1.5 2022/02/09 21:09:24 rillig Exp $ 1# $NetBSD: meta-cmd-cmp.mk,v 1.6 2022/03/02 19:32:15 sjg Exp $
2# 2#
3# Tests META_MODE command line comparison 3# Tests META_MODE command line comparison
4# 4#
5 5
6.MAIN: all 6.MAIN: all
7 7
8.MAKE.MODE= meta verbose silent=yes curdirok=yes 8.MAKE.MODE= meta verbose silent=yes curdirok=yes nofilemon
9tf:= .${.PARSEFILE:R} 9tf:= .${.PARSEFILE:R}
10 10
11.if ${.TARGETS:Nall} == "" 11.if ${.TARGETS:Nall} == ""
12all: prep one two change1 change2 filter0 filter1 filter2 filter3 post 12all: prep one two change1 change2 filter0 filter1 filter2 filter3 post
13 13
14CLEANFILES= ${tf}* 14CLEANFILES= ${tf}*
15 15
16prep post: .PHONY 16prep post: .PHONY
17 @rm -f ${CLEANFILES} 17 @rm -f ${CLEANFILES}
18 18
19.endif 19.endif
20 20
21FLAGS?= 21FLAGS?=