git: 68dc9c6b8ef8 - main - makefs/zfs tests: Run in parallel

The branch main has been updated by markj:

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

commit 68dc9c6b8ef86caef3962cc9177bb21d8f38b0ed
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2025-07-21 13:41:56 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2025-07-21 14:57:58 +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
---
 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 345b728651d6..748bafa06211 100644
--- a/usr.sbin/makefs/tests/Makefile
+++ b/usr.sbin/makefs/tests/Makefile
@@ -7,10 +7,6 @@ ATF_TESTS_SH+=	makefs_msdos_tests
 TEST_METADATA.makefs_msdos_tests+=	required_files="/sbin/mount_msdosfs"
 .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 d73da083a8c2..2fafce85b347 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"