Date: Mon, 29 Aug 2022 17:05:22 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 09a2fce092a4 - main - makefs tests: Do not run ZFS tests in parallel Message-ID: <202208291705.27TH5MOU013543@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=09a2fce092a4f51fcdac4f432ee960e2e002387e commit 09a2fce092a4f51fcdac4f432ee960e2e002387e Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2022-08-29 16:39:33 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2022-08-29 16:54:25 +0000 makefs tests: Do not run ZFS tests in parallel makefs-created pools always have the same GUID and thus cannot be imported simultaneously. Reported by: olivier --- usr.sbin/makefs/tests/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.sbin/makefs/tests/Makefile b/usr.sbin/makefs/tests/Makefile index 842c4d566259..d7df64ab5a7f 100644 --- a/usr.sbin/makefs/tests/Makefile +++ b/usr.sbin/makefs/tests/Makefile @@ -3,9 +3,14 @@ .include <src.opts.mk> ATF_TESTS_SH+= makefs_cd9660_tests +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} @@ -14,8 +19,6 @@ BINDIR= ${TESTSDIR} SCRIPTS+= makefs_tests_common.sh SCRIPTSNAME_makefs_tests_common.sh= makefs_tests_common.sh -TEST_METADATA.makefs_cd9660_tests+= required_files="/sbin/mount_cd9660" - .for t in ${ATF_TESTS_SH} TEST_METADATA.$t+= required_user="root" .endfor
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208291705.27TH5MOU013543>