From nobody Mon Aug 25 15:22:59 2025 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 4c9ZLD4sZ1z65vxq; Mon, 25 Aug 2025 15:23:00 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c9ZLD1HN4z3Xyw; Mon, 25 Aug 2025 15:23:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135380; 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=xKswL/xzJ44uCmjADkvqGvPFy38ifBzDRU+ikzIQxyQ=; b=GX/Ze22PH8AF8Eo32g2tfDpUr/pyW86dF37gwVHRAy2FkBEgDING8g3XpxWirCNYqIhc6f iYSkcpScjbyYGOHXsvVbjcZEA18cUWEMSEYrnafFQh4qyVydW5pGTg/CsaryE1fXYNHT8y eRjeKKTTH7IDW6vtFrLm51l4pj4zemnz4rcTCoZnhclhENo/GvIos2bRpZ6nS1vXyDuCz2 nQgjc8ZN1ybWXyu3qE1wWyQ2NlmhPD8kCl9rCaWon7RafFodqjqQ5GGxdu7qQcMqbHQUte sy6ETQjn9nSYhBU+eKDV4YzooJhZDH4hUneA38A4iyKURNmU259IjlBVH2c3lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756135380; 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=xKswL/xzJ44uCmjADkvqGvPFy38ifBzDRU+ikzIQxyQ=; b=qtPHJhDIveBdbZa43WDPEkNXza4FqLPj/4X9FUuYR6u1uKI+2Ycp3KM0l4Z4lshw1d9hxW UaeIihQV3vxJ3XRPNM2pn7ZDExn+aqVb+1po+Z+JG8jFlSiJBY5S5UpScRUOph28s2tNOk M3hvYzYdDghF3dCFF1wbtCQAVmK0KPNtB5VRyctMVojdpgTsli4mhRP9LX7qV0Eb5LYwGd 7cxcG+PtFDsufU6CcLQLoD6xkCOt9WSe0EmbPT8B3iStQtw2APOX3xIHU7UR7BGe60LyLI H+K05GqQ+C6EaDnB9DH2ucsJgHYNvRnGUR1o/VNY4G5C4ltkxKskJxupP6ew2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756135380; a=rsa-sha256; cv=none; b=EABXtTaLd/Bx/6XFSw7xaLZG9oIEsFzNOylgrcPp+Csao9+6gxFwTXy5RkuSllq/fMQXA+ HqGUyOHMmvVA+QImtcCXY50rB3KznP9oNlnSzW0G9WficDlTf3QfxLgdI3JQtlxG/OmsdF tz794vI09/3FAuuGSyada1GZhs8L1or0psdFHtmps6WrCWjaz4xHUE46vx1lT+zBMGY83X j9L3FDmUVTCp7QeZuJ5FhQJ13tjU3iO791HoKaZygldg/DShopB/7OIauXFmCpwUdrXJGD 37/2pOLp+wflvlrrQ9nMrLeCnoJJfGwj+k88PBo6VLGlXmq/ZxdlCJCMHhuyww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c9ZLD0lGKzv9V; Mon, 25 Aug 2025 15:23:00 +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 57PFMx3L054212; Mon, 25 Aug 2025 15:22:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57PFMx94054209; Mon, 25 Aug 2025 15:22:59 GMT (envelope-from git) Date: Mon, 25 Aug 2025 15:22:59 GMT Message-Id: <202508251522.57PFMx94054209@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5b42aac0013a - stable/14 - makefs/zfs 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5b42aac0013afa760a8071cdf16c70786c5802b9 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5b42aac0013afa760a8071cdf16c70786c5802b9 commit 5b42aac0013afa760a8071cdf16c70786c5802b9 Author: Mark Johnston AuthorDate: 2025-07-21 13:41:56 +0000 Commit: Mark Johnston CommitDate: 2025-08-25 13:57:57 +0000 makefs/zfs tests: Run in parallel Use the script PID as a pool GUID. This way, tests running in parallel will have pool GUIDs that won't collide, and the tests no longer need to be serialized. MFC after: 1 month (cherry picked from commit 68dc9c6b8ef86caef3962cc9177bb21d8f38b0ed) --- usr.sbin/makefs/tests/Makefile | 4 ---- usr.sbin/makefs/tests/makefs_zfs_tests.sh | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/usr.sbin/makefs/tests/Makefile b/usr.sbin/makefs/tests/Makefile index 98cc89031c64..a9c67dd92807 100644 --- a/usr.sbin/makefs/tests/Makefile +++ b/usr.sbin/makefs/tests/Makefile @@ -6,10 +6,6 @@ TEST_METADATA.makefs_cd9660_tests+= required_files="/sbin/mount_cd9660" ATF_TESTS_SH+= makefs_ffs_tests .if ${MK_ZFS} != "no" ATF_TESTS_SH+= makefs_zfs_tests -# ZFS pools created by makefs always have the same GUID, so OpenZFS -# refuses to import more than one at a time. Thus the ZFS tests cannot -# be run in parallel for now. -TEST_METADATA.makefs_zfs_tests+= is_exclusive="true" .endif BINDIR= ${TESTSDIR} diff --git a/usr.sbin/makefs/tests/makefs_zfs_tests.sh b/usr.sbin/makefs/tests/makefs_zfs_tests.sh index f155049d6f93..13abaf50fba4 100644 --- a/usr.sbin/makefs/tests/makefs_zfs_tests.sh +++ b/usr.sbin/makefs/tests/makefs_zfs_tests.sh @@ -28,7 +28,7 @@ # SUCH DAMAGE. # -MAKEFS="makefs -t zfs -o verify-txgs=true" +MAKEFS="makefs -t zfs -o verify-txgs=true -o poolguid=$$" ZFS_POOL_NAME="makefstest$$" TEST_ZFS_POOL_NAME="$TMPDIR/poolname"