From nobody Tue Jul 23 15:00:10 2024 X-Original-To: dev-commits-src-all@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 4WT0gb0NJmz5S4tY; Tue, 23 Jul 2024 15:00:11 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WT0gZ5S3fz4Txy; Tue, 23 Jul 2024 15:00:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721746810; 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=mdSxhg6HJbbwTLZTbwwDukWDiiDV0RVGH3X1gtf6fOY=; b=Tj+67dsnGmSjHJ473rRagDjiHOYFj6E5dcdpgFvSisJsmoLWT+b6WbC8XG09r2q/jaJQO1 CQz9QHmnIGiTU66LWhS7a27hkWbCDpG/E4krXUMj+gQHyy4Ic/Vi8eZ+/fm3KGQRuI26xc 2biAg0Seeu/O+6+/Qk8o/TmkahsqYgmZDD9XwAa6EI+JudlYH0xcD/Oe0HIvj+AKspwWS5 FEEbRHa7nuan4RKyHnWhOwYY3DidJLoH4zhhS3YmxZvPfvuLNY1Xl1bu6TpvNusI8RVXKb eGoqMUQccoE+yIJ7zXKm9fv4ZTjFX6LLGEpTA/pjvROiJJc2J5xKpeBS30pe+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721746810; a=rsa-sha256; cv=none; b=QCZeihkbMJqfvAWSVcUfdw4uUEwSom3RCF/SeV/LkcIZlzovoElib4bzf9wH4GwNwcUupK 15807MfqzPSyFSiCZUQj3HCVQhy2AJXnsUcb2M4ZKWuMp9wNFxa6b3x8Wzdcri8Lq1emVz SlgDXI5sR/xZW9/kbdtS6n+mRs02pQB88fqbqw3XLdYgI6XK6zsRSCBzBKmrf1gc3fjLUY NBpROAx6yGJUpe4PCAqB5n3hP+ewPu0CM2HteAmfoaGER5KAHaZTmqsBv5NmfyWiar2mCc e82/15lQUhaA19AJQahO1e0rwXIqgngchib7LTwdSrBq76gW1coV3KHTDMMRsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721746810; 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=mdSxhg6HJbbwTLZTbwwDukWDiiDV0RVGH3X1gtf6fOY=; b=PLfbY2CSH0fxWRQNHXw167pYXetkkIzE3xrEzXh7HEPrZzGbTvPzOUEdy7U3KqjzkZhfiO TaOnpLJkoPJB92k9kTqZDXIqEzYLuBBD/gL9pKLslMIrlS/nUbdwJrSe4enA7jlXvyEMhE /a7fZ2ym27X48qiiibazsD+HCdtIUUNSSS2bF0xvEh7sMt55uUDIOlmYoiIMC9MV2WuPiE jqQPAy/J+nlg0HedDVwgfbew49s5HcjFdI8ZhC1x/NQIF5PdLXf43mX8zlIwpbMHG6iSey l8z0oKgqFeemxcKINS2VLsWced54hOymfHrZe68AnIffCL73nYxPBcH17/EYEQ== 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 4WT0gZ4y8HzXv5; Tue, 23 Jul 2024 15:00:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46NF0AXi079804; Tue, 23 Jul 2024 15:00:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46NF0AGe079800; Tue, 23 Jul 2024 15:00:10 GMT (envelope-from git) Date: Tue, 23 Jul 2024 15:00:10 GMT Message-Id: <202407231500.46NF0AGe079800@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: 4f752a1583dc - main - netpfil tests: run in parallel List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 4f752a1583dc97d166caae7f844bf42715e99978 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4f752a1583dc97d166caae7f844bf42715e99978 commit 4f752a1583dc97d166caae7f844bf42715e99978 Author: Kristof Provost AuthorDate: 2024-07-19 08:03:30 +0000 Commit: Kristof Provost CommitDate: 2024-07-23 14:59:44 +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 --- 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 320e61f3fb83..4cd3f1a8a156 100644 --- a/tests/sys/netpfil/common/Makefile +++ b/tests/sys/netpfil/common/Makefile @@ -12,8 +12,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 diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index c3e77415e995..6b57260796ed 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -54,8 +54,9 @@ ATF_TESTS_PYTEST+= frag6.py ATF_TESTS_PYTEST+= nat66.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