From owner-dev-commits-src-all@freebsd.org Fri Jul 16 00:40:33 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2FA64654BD6; Fri, 16 Jul 2021 00:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GQspn0DDVz3KRG; Fri, 16 Jul 2021 00:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DCF3213B4F; Fri, 16 Jul 2021 00:40:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16G0eWqT016805; Fri, 16 Jul 2021 00:40:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16G0eWLI016804; Fri, 16 Jul 2021 00:40:32 GMT (envelope-from git) Date: Fri, 16 Jul 2021 00:40:32 GMT Message-Id: <202107160040.16G0eWLI016804@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: feb1dc84d895 - stable/12 - Skip netgraph tests when WITHOUT_NETGRAPH is set MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: feb1dc84d895bfb53b0b205a1b55b955ab32b0a5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jul 2021 00:40:33 -0000 The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=feb1dc84d895bfb53b0b205a1b55b955ab32b0a5 commit feb1dc84d895bfb53b0b205a1b55b955ab32b0a5 Author: Ed Maste AuthorDate: 2021-07-06 13:44:15 +0000 Commit: Ed Maste 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