The branch stable/14 has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=5b42aac0013afa760a8071cdf16c70786c5802b9
commit 5b42aac0013afa760a8071cdf16c70786c5802b9
Author: Mark Johnston <ma...@freebsd.org>
AuthorDate: 2025-07-21 13:41:56 +0000
Commit: Mark Johnston <ma...@freebsd.org>
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"
