git: feb1dc84d895 - stable/12 - Skip netgraph tests when WITHOUT_NETGRAPH is set

Ed Maste emaste at FreeBSD.org
Fri Jul 16 00:40:33 UTC 2021


The branch stable/12 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=feb1dc84d895bfb53b0b205a1b55b955ab32b0a5

commit feb1dc84d895bfb53b0b205a1b55b955ab32b0a5
Author:     Ed Maste <emaste at FreeBSD.org>
AuthorDate: 2021-07-06 13:44:15 +0000
Commit:     Ed Maste <emaste at FreeBSD.org>
CommitDate: 2021-07-16 00:39:34 +0000

    Skip netgraph tests when WITHOUT_NETGRAPH is set
    
    PR:             256986
    Reported by:    John Marshall
    MFC after:      1 week
    Sponsored by:   The FreeBSD Foundation
    
    (cherry picked from commit c9144ec14d2a5a53cfe91ada1b3b9c06b78dc999)
---
 tests/sys/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/sys/Makefile b/tests/sys/Makefile
index 2bf51bcd3fd7..5d96c7654a28 100644
--- a/tests/sys/Makefile
+++ b/tests/sys/Makefile
@@ -18,7 +18,7 @@ TESTS_SUBDIRS+=		kern
 TESTS_SUBDIRS+=		kqueue
 TESTS_SUBDIRS+=		mac
 TESTS_SUBDIRS+=		mqueue
-TESTS_SUBDIRS+=		netgraph
+TESTS_SUBDIRS+=		${_netgraph}
 TESTS_SUBDIRS+=		netinet
 TESTS_SUBDIRS+=		netinet6
 TESTS_SUBDIRS+=		netipsec
@@ -38,6 +38,10 @@ _audit=	audit
 _cddl=	cddl
 .endif
 
+.if ${MK_NETGRAPH} != "no"
+_netgraph= netgraph
+.endif
+
 # Items not integrated into kyua runs by default
 SUBDIR+=		pjdfstest
 


More information about the dev-commits-src-all mailing list