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
This commit is contained in:
parent
a3b6b3ac4d
commit
09a2fce092
@ -3,9 +3,14 @@
|
|||||||
.include <src.opts.mk>
|
.include <src.opts.mk>
|
||||||
|
|
||||||
ATF_TESTS_SH+= makefs_cd9660_tests
|
ATF_TESTS_SH+= makefs_cd9660_tests
|
||||||
|
TEST_METADATA.makefs_cd9660_tests+= required_files="/sbin/mount_cd9660"
|
||||||
ATF_TESTS_SH+= makefs_ffs_tests
|
ATF_TESTS_SH+= makefs_ffs_tests
|
||||||
.if ${MK_ZFS} != "no"
|
.if ${MK_ZFS} != "no"
|
||||||
ATF_TESTS_SH+= makefs_zfs_tests
|
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
|
.endif
|
||||||
|
|
||||||
BINDIR= ${TESTSDIR}
|
BINDIR= ${TESTSDIR}
|
||||||
@ -14,8 +19,6 @@ BINDIR= ${TESTSDIR}
|
|||||||
SCRIPTS+= makefs_tests_common.sh
|
SCRIPTS+= makefs_tests_common.sh
|
||||||
SCRIPTSNAME_makefs_tests_common.sh= 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}
|
.for t in ${ATF_TESTS_SH}
|
||||||
TEST_METADATA.$t+= required_user="root"
|
TEST_METADATA.$t+= required_user="root"
|
||||||
.endfor
|
.endfor
|
||||||
|
Loading…
Reference in New Issue
Block a user