git: eed634d113df - main - if_ovpn tests: fix WITHOUT_PF

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Kristof Provost <kp_at_FreeBSD.org>
Date: Thu, 18 Aug 2022 09:26:03 UTC

The branch main has been updated by kp:

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

commit eed634d113df69d26eb9480e4e95919b2e9ee5bc
Author:     Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2022-08-18 09:23:33 +0000
Commit:     Kristof Provost <kp@FreeBSD.org>
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é <olivier@freebsd.org>
    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 <src.opts.mk>
+
 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