Skip to content

Commit 7f9a480

Browse files
chrislongrosbehlendorf
authored andcommitted
ZTS: remove outdated FreeBSD skip from trim tests
FreeBSD has supported hole punching via fspacectl(2) since FreeBSD 14.0 and the test library already handles this using truncate -d. Remove the skip that prevented trim tests from running on FreeBSD. Tests will still skip if the hardware does not support TRIM/UNMAP, which is checked separately via diskinfo. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Christos Longros <chris.longros@gmail.com> Closes #18398
1 parent 3162c63 commit 7f9a480

6 files changed

Lines changed: 0 additions & 17 deletions

File tree

tests/test-runner/bin/zts-report.py.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,6 @@ if sys.platform.startswith('freebsd'):
173173
'cli_root/zpool_resilver/zpool_resilver_concurrent':
174174
['SKIP', na_reason],
175175
'zoned_uid/setup': ['SKIP', na_reason],
176-
'cli_root/zpool_wait/zpool_wait_trim_basic': ['SKIP', trim_reason],
177-
'cli_root/zpool_wait/zpool_wait_trim_cancel': ['SKIP', trim_reason],
178-
'cli_root/zpool_wait/zpool_wait_trim_flag': ['SKIP', trim_reason],
179176
'cli_root/zfs_unshare/zfs_unshare_008_pos': ['SKIP', na_reason],
180177
'cp_files/cp_files_002_pos': ['SKIP', na_reason],
181178
'link_count/link_count_001': ['SKIP', na_reason],

tests/zfs-tests/tests/functional/cli_root/zpool_trim/setup.ksh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
verify_runnable "global"
2626

2727
if is_freebsd; then
28-
log_unsupported "FreeBSD has no hole punching mechanism for the time being."
2928
diskinfo -v $DISKS | grep -qE 'No.*# TRIM/UNMAP support' &&
3029
log_unsupported "DISKS do not support discard (TRIM/UNMAP)"
3130
else

tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_trim_basic.ksh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ function trim_in_progress
4646
zpool status -t "$pool" | grep "trimmed, started"
4747
}
4848

49-
if is_freebsd; then
50-
log_unsupported "FreeBSD has no hole punching mechanism for the time being."
51-
fi
52-
5349
typeset -r FILE_VDEV="$TESTDIR/file_vdev"
5450
typeset pid
5551

tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_trim_cancel.ksh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@ function do_test
5959
bkgrnd_proc_succeeded $pid
6060
}
6161

62-
if is_freebsd; then
63-
log_unsupported "FreeBSD has no hole punching mechanism for the time being."
64-
fi
65-
6662
typeset pid
6763
typeset -r FILE_VDEV="$TESTDIR/file_vdev1"
6864

tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_trim_flag.ksh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ function cleanup
4141
[[ -d "$TESTDIR" ]] && log_must rm -r "$TESTDIR"
4242
}
4343

44-
if is_freebsd; then
45-
log_unsupported "FreeBSD has no hole punching mechanism for the time being."
46-
fi
47-
4844
typeset trim12_pid trim3_pid
4945
typeset -r VDEV1="$TESTDIR/file_vdev1"
5046
typeset -r VDEV2="$TESTDIR/file_vdev2"

tests/zfs-tests/tests/functional/trim/setup.ksh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
verify_runnable "global"
2626

2727
if is_freebsd; then
28-
log_unsupported "FreeBSD has no hole punching mechanism for the time being."
2928
diskinfo -v $DISKS | grep -qE 'No.*# TRIM/UNMAP support' &&
3029
log_unsupported "DISKS do not support discard (TRIM/UNMAP)"
3130
else

0 commit comments

Comments
 (0)