diff --git a/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_001_neg.ksh b/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_001_neg.ksh index 4a30d0dca7b4..53e1c57cfd5f 100644 --- a/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_001_neg.ksh +++ b/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_001_neg.ksh @@ -44,7 +44,7 @@ # # STRATEGY: # 1. Create a ZFS volume -# 2. Use dumpadm add the volume as dump device +# 2. Use dumpon add the volume as dump device # 3. Verify the return code as expected. # # TESTABILITY: explicit @@ -71,15 +71,10 @@ function cleanup log_assert "Verify that ZFS volume cannot act as dump device until dumpswap supported." log_onexit cleanup -test_requires DUMPADM - voldev=/dev/zvol/$TESTPOOL/$TESTVOL savedumpdev=$(get_dumpdevice) -if ! is_dumpswap_supported $TESTPOOL ; then - log_mustnot $DUMPADM -d $voldev -else - safe_dumpadm $voldev -fi +# FreeBSD doesn't support using zvols as dump devices for any pool version +log_mustnot $DUMPON $voldev log_pass "ZFS volume cannot act as dump device until dumpswap supported as expected." diff --git a/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_test.sh b/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_test.sh index 8c740f9fac04..6f810de3fba4 100755 --- a/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_test.sh +++ b/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_test.sh @@ -30,7 +30,6 @@ atf_test_case zvol_misc_001_neg cleanup zvol_misc_001_neg_head() { atf_set "descr" "Verify that ZFS volume cannot act as dump device until dumpswap supported." - atf_set "require.progs" dumpadm } zvol_misc_001_neg_body() { @@ -82,6 +81,7 @@ zvol_misc_003_neg_head() } zvol_misc_003_neg_body() { + atf_skip "FreeBSD does not yet support dumping to a zvol" . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zvol_misc.cfg @@ -106,6 +106,7 @@ zvol_misc_004_pos_head() } zvol_misc_004_pos_body() { + atf_skip "FreeBSD does not yet support dumping to a zvol" . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zvol_misc.cfg @@ -130,6 +131,7 @@ zvol_misc_005_neg_head() } zvol_misc_005_neg_body() { + atf_skip "FreeBSD does not yet support dumping to a zvol" . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zvol_misc.cfg @@ -154,6 +156,7 @@ zvol_misc_006_pos_head() } zvol_misc_006_pos_body() { + atf_skip "FreeBSD does not yet support dumping to a zvol" . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zvol_misc.cfg