Module Name: src
Committed By: sjg
Date: Wed Mar 2 19:32:16 UTC 2022
Modified Files:
src/usr.bin/make/unit-tests: depsrc-meta.mk meta-cmd-cmp.mk
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/depsrc-meta.mk
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/make/unit-tests/meta-cmd-cmp.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/depsrc-meta.mk
diff -u src/usr.bin/make/unit-tests/depsrc-meta.mk:1.6 src/usr.bin/make/unit-tests/depsrc-meta.mk:1.7
--- src/usr.bin/make/unit-tests/depsrc-meta.mk:1.6 Wed Jan 26 22:47:03 2022
+++ src/usr.bin/make/unit-tests/depsrc-meta.mk Wed Mar 2 19:32:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: depsrc-meta.mk,v 1.6 2022/01/26 22:47:03 rillig Exp $
+# $NetBSD: depsrc-meta.mk,v 1.7 2022/03/02 19:32:15 sjg Exp $
#
# Tests for the special source .META in dependency declarations.
@@ -9,7 +9,7 @@
.if make(actual-test)
.MAKEFLAGS: -dM
-.MAKE.MODE= meta curDirOk=true
+.MAKE.MODE= meta curDirOk=true nofilemon
.endif
actual-test: depsrc-meta-target
Index: src/usr.bin/make/unit-tests/meta-cmd-cmp.mk
diff -u src/usr.bin/make/unit-tests/meta-cmd-cmp.mk:1.5 src/usr.bin/make/unit-tests/meta-cmd-cmp.mk:1.6
--- src/usr.bin/make/unit-tests/meta-cmd-cmp.mk:1.5 Wed Feb 9 21:09:24 2022
+++ src/usr.bin/make/unit-tests/meta-cmd-cmp.mk Wed Mar 2 19:32:15 2022
@@ -1,11 +1,11 @@
-# $NetBSD: meta-cmd-cmp.mk,v 1.5 2022/02/09 21:09:24 rillig Exp $
+# $NetBSD: meta-cmd-cmp.mk,v 1.6 2022/03/02 19:32:15 sjg Exp $
#
# Tests META_MODE command line comparison
#
.MAIN: all
-.MAKE.MODE= meta verbose silent=yes curdirok=yes
+.MAKE.MODE= meta verbose silent=yes curdirok=yes nofilemon
tf:= .${.PARSEFILE:R}
.if ${.TARGETS:Nall} == ""
