diff options
| author | Rich Ercolani <[email protected]> | 2021-11-16 14:40:10 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-11-16 12:40:10 -0700 |
| commit | 269b5dadcfd1d5732cf763dddcd46009a332eae4 (patch) | |
| tree | b8984ee595cffcba72d0dfc66be7a15fc5ad7070 /tests/zfs-tests | |
| parent | b8dcfb2c9ff35fabcfe9dffa58278c7e14b18088 (diff) | |
Enable edonr in FreeBSD
The code is integrated, builds fine, runs fine, there's not really
any reason not to.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Ryan Moeller <[email protected]>
Reviewed-by: Allan Jude <[email protected]>
Reviewed-by: Tony Nguyen <[email protected]>
Signed-off-by: Rich Ercolani <[email protected]>
Closes #12735
Diffstat (limited to 'tests/zfs-tests')
4 files changed, 5 insertions, 18 deletions
diff --git a/tests/zfs-tests/tests/functional/checksum/Makefile.am b/tests/zfs-tests/tests/functional/checksum/Makefile.am index ddabc0302..717098aa0 100644 --- a/tests/zfs-tests/tests/functional/checksum/Makefile.am +++ b/tests/zfs-tests/tests/functional/checksum/Makefile.am @@ -21,13 +21,11 @@ dist_pkgdata_DATA = \ pkgexecdir = $(datadir)/@PACKAGE@/zfs-tests/tests/functional/checksum pkgexec_PROGRAMS = \ + edonr_test \ skein_test \ sha2_test skein_test_SOURCES = skein_test.c sha2_test_SOURCES = sha2_test.c -if BUILD_LINUX -pkgexec_PROGRAMS += edonr_test edonr_test_SOURCES = edonr_test.c -endif diff --git a/tests/zfs-tests/tests/functional/checksum/default.cfg b/tests/zfs-tests/tests/functional/checksum/default.cfg index bc2f6e261..afb956093 100644 --- a/tests/zfs-tests/tests/functional/checksum/default.cfg +++ b/tests/zfs-tests/tests/functional/checksum/default.cfg @@ -30,7 +30,4 @@ . $STF_SUITE/include/libtest.shlib -set -A CHECKSUM_TYPES "fletcher2" "fletcher4" "sha256" "sha512" "skein" -if ! is_freebsd; then - CHECKSUM_TYPES+=("edonr") -fi +set -A CHECKSUM_TYPES "fletcher2" "fletcher4" "sha256" "sha512" "skein" "edonr" diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_set/checksum_001_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_set/checksum_001_pos.ksh index f30d00522..27003b21b 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_set/checksum_001_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_set/checksum_001_pos.ksh @@ -46,10 +46,7 @@ verify_runnable "both" set -A dataset "$TESTPOOL" "$TESTPOOL/$TESTFS" "$TESTPOOL/$TESTVOL" -set -A values "on" "off" "fletcher2" "fletcher4" "sha256" "sha512" "skein" "noparity" -if is_linux; then - values+=("edonr") -fi +set -A values "on" "off" "fletcher2" "fletcher4" "sha256" "sha512" "skein" "edonr" "noparity" log_assert "Setting a valid checksum on a file system, volume," \ "it should be successful." 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 6075e1f1a..accbf69cf 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 @@ -72,6 +72,7 @@ typeset -a properties=( "feature@large_blocks" "feature@sha512" "feature@skein" + "feature@edonr" "feature@device_removal" "feature@obsolete_counts" "feature@zpool_checkpoint" @@ -97,10 +98,4 @@ if is_linux || is_freebsd; then "feature@livelist" "feature@zstd_compress" ) -fi - -if ! is_freebsd; then - properties+=( - "feature@edonr" - ) -fi +fi
\ No newline at end of file |