From nobody Thu Aug 18 09:26:03 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M7fdR3W1yz4Yysf; Thu, 18 Aug 2022 09:26:03 +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 4M7fdR359rz3XtZ; Thu, 18 Aug 2022 09:26:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660814763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uZrgQ1EoKZUXBn4Djlm48Aclaq5klY+E4/onm4D7EzM=; b=oEUAwGyhccQ1ooVGPORPbVPgTVNUyPwkq0oc87q0Lr9nbnjcRp6NhB0yvhsfJYru3nM40c 5x6gMLGkBgVa2LpLjT1jaz0Mwv4ablVpp4Kddn/tDcgwXJUNoz1R6EcXyQVtExK5QHtf25 z4OMBaUru5bGhkcIc0+NdYpYmk4TNC5x9fEWnZF0PPElZTC3Cop6XYNcOqNDJBprUQqlkj ehIM40DMOIgP/j7okqJ4SWWwZ5Gg/an8OBsAccXa3/MpXehiYezH81jGG8RRKu/FBI0g+M s1XgvP+sb4TCwyJntBvMFHmSdvGdhIpcmRAeQhjWp2RT7vfriGXc7JQqerWg7A== 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 4M7fdR29Nzz1Npy; Thu, 18 Aug 2022 09:26:03 +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 27I9Q37q043933; Thu, 18 Aug 2022 09:26:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27I9Q3WT043932; Thu, 18 Aug 2022 09:26:03 GMT (envelope-from git) Date: Thu, 18 Aug 2022 09:26:03 GMT Message-Id: <202208180926.27I9Q3WT043932@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: eed634d113df - main - if_ovpn tests: fix WITHOUT_PF List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eed634d113df69d26eb9480e4e95919b2e9ee5bc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660814763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uZrgQ1EoKZUXBn4Djlm48Aclaq5klY+E4/onm4D7EzM=; b=CBTPyOYHB1RrrIVqpkJciWx7jd1LPWcu9ZStA6UTYXGRC2uyGq3tn/4tp8PCDKNOTQmqtS ZOHZhw4l/WMrOnBZiYOlT+SwI0woll34GBaGrarz0lJsteAr+AZeBZhicH+sreXPpdZ3oV FKGHEjDYQKT+q2WRTHNUwFeni3cD7bB/CEWoHfxR+2/wwmncw7qMrdnjkWuaKtkIps5ghU r+BTh3kEour/6+bYnmAFvIrAQYKK1gNc0Im7ay488cwUvi0XNbl+CV1kTLzHdDRUeWLsxa u1P/UC8Jps2Tn7HntF/Hyhkv+AEwXie6CAlJ1J0QEfVe6QHZged5wLvmHlUTUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660814763; a=rsa-sha256; cv=none; b=yrMqNtkK1kXmsoBq/goL0I/n/nDCntw2S0sZqR192AxSHgtC2avdywgaT9G7/ADy+BFBtO gXD4gqBQOE1ExAbv6uoVnAzxOq8FfUUjwsm1iZGZZaVaR9XCs6LksIvE/LQtRQ26wDbo/E F0VHD0aMizEZg1Lxu8fEdjK6low8a/cdkQdmtXWyZmAnF7D5GZERs3dXxvMrZpSvs5BEzy oM/uZCdwrm7JatnQA7g6J5hRDzQEnWApiCp6AbDmy1nGM1TcZ7RGd/sMta18e/Wspg5DJ+ XFIB2aK6Scnr1owYPtYj3B0egKCUdUcW97i4EuvJK8ckMSkNfdBZc7Ezk0LQzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=eed634d113df69d26eb9480e4e95919b2e9ee5bc commit eed634d113df69d26eb9480e4e95919b2e9ee5bc Author: Kristof Provost AuthorDate: 2022-08-18 09:23:33 +0000 Commit: Kristof Provost CommitDate: 2022-08-18 09:25:51 +0000 if_ovpn tests: fix WITHOUT_PF At least one if_ovpn.sh test relies on pf, so the file includes netpfil/pf/utils.subr, which doesn't exist if WITHOUT_PF is set. Do not install the if_ovpn.sh tests if pf is disabled. Suggested by: Olivier Cochard-Labbé Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/net/if_ovpn/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/sys/net/if_ovpn/Makefile b/tests/sys/net/if_ovpn/Makefile index a221e25b7e92..63fe05077f12 100644 --- a/tests/sys/net/if_ovpn/Makefile +++ b/tests/sys/net/if_ovpn/Makefile @@ -1,8 +1,12 @@ +.include + PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/net/if_ovpn +.if ${MK_PF} != "no" ATF_TESTS_SH+= if_ovpn +.endif ATF_TESTS_C+= if_ovpn_c LIBADD+= nv