From 0ecd9109238f1e322b9a3a44781277b7b7ce5c38 Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Tue, 28 Jan 2020 11:38:02 -0500 Subject: [PATCH] ZTS: Don't use edonr on FreeBSD FreeBSD doesn't support feature@edonr. Reviewed-by: Brian Behlendorf Signed-off-by: Ryan Moeller Closes #9901 --- tests/zfs-tests/include/properties.shlib | 7 ++++++- tests/zfs-tests/tests/functional/checksum/default.cfg | 7 ++++++- .../tests/functional/checksum/filetest_001_pos.ksh | 10 ---------- .../tests/functional/cli_root/zpool_get/zpool_get.cfg | 7 ++++++- .../tests/functional/removal/removal_nopwrite.ksh | 2 +- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/tests/zfs-tests/include/properties.shlib b/tests/zfs-tests/include/properties.shlib index 1b6f5a4e59..a6a3389120 100644 --- a/tests/zfs-tests/include/properties.shlib +++ b/tests/zfs-tests/include/properties.shlib @@ -13,9 +13,14 @@ # Copyright (c) 2012, 2016, Delphix. All rights reserved. # +. $STF_SUITE/include/libtest.shlib + typeset -a compress_prop_vals=('off' 'lzjb' 'lz4' 'gzip' 'zle') typeset -a checksum_prop_vals=('on' 'off' 'fletcher2' 'fletcher4' 'sha256' - 'noparity' 'sha512' 'skein' 'edonr') + 'noparity' 'sha512' 'skein') +if ! is_freebsd; then + checksum_prop_vals+=('edonr') +fi typeset -a recsize_prop_vals=('512' '1024' '2048' '4096' '8192' '16384' '32768' '65536' '131072' '262144' '524288' '1048576') typeset -a canmount_prop_vals=('on' 'off' 'noauto') diff --git a/tests/zfs-tests/tests/functional/checksum/default.cfg b/tests/zfs-tests/tests/functional/checksum/default.cfg index 138c42b998..bc2f6e261b 100644 --- a/tests/zfs-tests/tests/functional/checksum/default.cfg +++ b/tests/zfs-tests/tests/functional/checksum/default.cfg @@ -28,4 +28,9 @@ # Copyright (c) 2013 by Delphix. All rights reserved. # -set -A CHECKSUM_TYPES "fletcher2" "fletcher4" "sha256" "sha512" "skein" "edonr" +. $STF_SUITE/include/libtest.shlib + +set -A CHECKSUM_TYPES "fletcher2" "fletcher4" "sha256" "sha512" "skein" +if ! is_freebsd; then + CHECKSUM_TYPES+=("edonr") +fi diff --git a/tests/zfs-tests/tests/functional/checksum/filetest_001_pos.ksh b/tests/zfs-tests/tests/functional/checksum/filetest_001_pos.ksh index 4bee69c244..27dad07263 100755 --- a/tests/zfs-tests/tests/functional/checksum/filetest_001_pos.ksh +++ b/tests/zfs-tests/tests/functional/checksum/filetest_001_pos.ksh @@ -75,11 +75,6 @@ firstvdev=${array[0]} typeset -i i=1 while [[ $i -lt ${#CHECKSUM_TYPES[*]} ]]; do type=${CHECKSUM_TYPES[i]} - # edonr not supported on FreeBSD - if is_freebsd && [[ "$type" == "edonr" ]] ; then - (( i = i + 1 )) - continue - fi log_must zfs set checksum=$type $TESTPOOL log_must file_write -o overwrite -f $TESTDIR/test_$type \ -b $WRITESZ -c 5 -d R @@ -101,11 +96,6 @@ log_assert "Test corrupting the files and seeing checksum errors" typeset -i j=1 while [[ $j -lt ${#CHECKSUM_TYPES[*]} ]]; do type=${CHECKSUM_TYPES[$j]} - # edonr not supported on FreeBSD - if is_freebsd && [[ "$type" == "edonr" ]] ; then - (( j = j + 1 )) - continue - fi log_must zfs set checksum=$type $TESTPOOL log_must file_write -o overwrite -f $TESTDIR/test_$type \ -b $WRITESZ -c 5 -d R diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg b/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg index 566a56c1a7..ee5b2b4e17 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg @@ -71,7 +71,6 @@ typeset -a properties=( "feature@large_blocks" "feature@sha512" "feature@skein" - "feature@edonr" "feature@device_removal" "feature@obsolete_counts" "feature@zpool_checkpoint" @@ -95,3 +94,9 @@ if is_linux || is_freebsd; then "feature@livelist" ) fi + +if ! is_freebsd; then + properties+=( + "feature@edonr" + ) +fi diff --git a/tests/zfs-tests/tests/functional/removal/removal_nopwrite.ksh b/tests/zfs-tests/tests/functional/removal/removal_nopwrite.ksh index e5d8261e80..cede81ad60 100755 --- a/tests/zfs-tests/tests/functional/removal/removal_nopwrite.ksh +++ b/tests/zfs-tests/tests/functional/removal/removal_nopwrite.ksh @@ -29,7 +29,7 @@ BLOCKSIZE=8192 origin="$TESTPOOL/$TESTFS" log_must zfs set compress=on $origin -log_must zfs set checksum=edonr $origin +log_must zfs set checksum=skein $origin log_must zfs set recordsize=8k $origin dd if=/dev/urandom of=$TESTDIR/file_8k bs=1024k count=$MEGS oflag=sync \