git: c5fc967cf158 - stable/14 - netpfil tests: run in parallel

From: Igor Ostapenko <igoro_at_FreeBSD.org>
Date: Thu, 17 Oct 2024 13:49:52 UTC
The branch stable/14 has been updated by igoro:

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

commit c5fc967cf158f47ff479155b9ee2f9cfa852cd85
Author:     Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2024-07-19 08:03:30 +0000
Commit:     Igor Ostapenko <igoro@FreeBSD.org>
CommitDate: 2024-10-17 13:45:29 +0000

    netpfil tests: run in parallel
    
    Run these tests in their own (vnet) jail so we don't have to worry about IP
    range or jail name conflicts.
    
    Reviewed by:    markj
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
    Differential Revision:  https://reviews.freebsd.org/D46040
    
    (cherry picked from commit 4f752a1583dc97d166caae7f844bf42715e99978)
    
    Approved by:    kp (mentor), markj (mentor)
---
 tests/sys/netpfil/common/Makefile | 5 +++--
 tests/sys/netpfil/ipfw/Makefile   | 4 ++++
 tests/sys/netpfil/pf/Makefile     | 5 +++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/sys/netpfil/common/Makefile b/tests/sys/netpfil/common/Makefile
index 0003aac28779..2b6a812482ec 100644
--- a/tests/sys/netpfil/common/Makefile
+++ b/tests/sys/netpfil/common/Makefile
@@ -13,8 +13,9 @@ ATF_TESTS_SH+=	\
 		fragments \
 		forward
 
-# Tests reuse jail names and so cannot run in parallel.
-TEST_METADATA+=	is_exclusive=true
+# Allow tests to run in parallel in their own jails
+TEST_METADATA+= execenv="jail"
+TEST_METADATA+= execenv_jail_params="vnet allow.raw_sockets"
 
 ${PACKAGE}FILES+=	\
 		utils.subr \
diff --git a/tests/sys/netpfil/ipfw/Makefile b/tests/sys/netpfil/ipfw/Makefile
index 1d4629c0e738..78882ef51aec 100644
--- a/tests/sys/netpfil/ipfw/Makefile
+++ b/tests/sys/netpfil/ipfw/Makefile
@@ -5,4 +5,8 @@ TESTSDIR=       ${TESTSBASE}/sys/netpfil/ipfw
 ATF_TESTS_SH+=	fwd
 ${PACKAGE}FILES+=	fwd_inetd.conf
 
+# Allow tests to run in parallel in their own jails
+TEST_METADATA+= execenv="jail"
+TEST_METADATA+= execenv_jail_params="vnet allow.raw_sockets"
+
 .include <bsd.test.mk>
diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile
index 9b793417c1d8..085cdf043606 100644
--- a/tests/sys/netpfil/pf/Makefile
+++ b/tests/sys/netpfil/pf/Makefile
@@ -47,8 +47,9 @@ ATF_TESTS_SH+=	altq \
 ATF_TESTS_PYTEST+=	frag6.py
 ATF_TESTS_PYTEST+=	sctp.py
 
-# Tests reuse jail names and so cannot run in parallel.
-TEST_METADATA+=	is_exclusive=true
+# Allow tests to run in parallel in their own jails
+TEST_METADATA+= execenv="jail"
+TEST_METADATA+= execenv_jail_params="vnet allow.raw_sockets"
 
 PROGS=	divapp