common: unify _require_batched_discard

To check for FITRIM tests used  _require_fstrim() and
_test_batched_discard() but as _test_batched_discard() already
includes _test_fstrim() unify FSTRIM check throughout xfstests with
_require_batched_discard().

Signed-off-by: Dushan Tcholich <dusanc@gmail.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Dushan Tcholich
2014-12-16 10:53:57 +11:00
committed by Dave Chinner
parent ba3fc9f85b
commit 01d42b7efe
6 changed files with 7 additions and 15 deletions
+1 -2
View File
@@ -40,13 +40,12 @@ mypid=$$
_supported_fs generic
_supported_os Linux
_require_math
_require_fstrim
_require_scratch
_scratch_mkfs >/dev/null 2>&1
_scratch_mount
_test_batched_discard $SCRATCH_MNT || _notrun "FITRIM not supported on $SCRATCH_DEV"
_require_batched_discard $SCRATCH_MNT
fssize=$($DF_PROG -k | grep "$SCRATCH_MNT" | grep "$SCRATCH_DEV" | awk '{print $3}')