commit 915ed8bcd1864f4863c592cdff3ad00b26193e30 Author: Andriy Gapon Date: Thu Feb 22 20:25:32 2018 +0200 fix typo, DISK vs DISKS diff --git a/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh b/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh index 3dba73a330d8c..5d3632c157448 100755 --- a/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh +++ b/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh @@ -36,7 +36,7 @@ zpool_destroy_001_pos_body() . $(atf_get_srcdir)/zpool_destroy.cfg verify_zvol_recursive - verify_disk_count "$DISK" 1 + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/zpool_destroy_001_pos.ksh || atf_fail "Testcase failed" } zpool_destroy_001_pos_cleanup() @@ -59,7 +59,7 @@ zpool_destroy_002_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_destroy.cfg - verify_disk_count "$DISK" 1 + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/zpool_destroy_002_pos.ksh || atf_fail "Testcase failed" } zpool_destroy_002_pos_cleanup() diff --git a/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export_test.sh b/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export_test.sh index b4f736fac221d..b6aad117cfe63 100755 --- a/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export_test.sh +++ b/head/tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export_test.sh @@ -35,7 +35,7 @@ zpool_export_001_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_export.cfg - verify_disk_count "$DISK" 1 + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_export_001_pos.ksh || atf_fail "Testcase failed" } @@ -59,7 +59,7 @@ zpool_export_002_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_export.cfg - verify_disk_count "$DISK" 1 + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_export_002_pos.ksh || atf_fail "Testcase failed" } @@ -83,7 +83,7 @@ zpool_export_003_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_export.cfg - verify_disk_count "$DISK" 1 + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_export_003_neg.ksh || atf_fail "Testcase failed" } @@ -107,7 +107,7 @@ zpool_export_004_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_export.cfg - verify_disk_count "$DISK" 1 + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_export_004_pos.ksh || atf_fail "Testcase failed" } diff --git a/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_test.sh b/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_test.sh index 9947906e9adce..8f6eec5f47785 100755 --- a/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_test.sh +++ b/head/tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_test.sh @@ -57,7 +57,7 @@ zpool_get_002_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_get.cfg - verify_disk_count "$DISK" 1 + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_get_002_pos.ksh || atf_fail "Testcase failed" } @@ -81,7 +81,7 @@ zpool_get_003_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_get.cfg - verify_disk_count "$DISK" 1 + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_get_003_pos.ksh || atf_fail "Testcase failed" } @@ -105,7 +105,7 @@ zpool_get_004_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_get.cfg - verify_disk_count "$DISK" 1 + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_get_004_neg.ksh || atf_fail "Testcase failed" } diff --git a/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history_test.sh b/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history_test.sh index bf28c1eaae09a..64fd067d2266b 100755 --- a/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history_test.sh +++ b/head/tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history_test.sh @@ -35,7 +35,7 @@ zpool_history_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_history.cfg - verify_disk_count "$DISK" 1 + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_history_001_neg.ksh || atf_fail "Testcase failed" } @@ -59,7 +59,7 @@ zpool_history_002_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_history.cfg - verify_disk_count "$DISK" 1 + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_history_002_pos.ksh || atf_fail "Testcase failed" }