From: Dushan Tcholich <dusanc@gmail.com>
Date: Mon, 15 Dec 2014 23:53:57 +0000 (+1100)
Subject: common: unify _require_batched_discard
X-Git-Tag: v2022.05.01~2985
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=01d42b7efe3fcb9169befda3072c41d25a87c920;p=xfstests-dev.git

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>
---

diff --git a/common/rc b/common/rc
index ec4440b3..cddc8487 100644
--- a/common/rc
+++ b/common/rc
@@ -2347,14 +2347,14 @@ _require_fstrim()
 	fi
 }
 
-_test_batched_discard()
+_require_batched_discard()
 {
 	if [ $# -ne 1 ]; then
-		echo "Usage: _test_batched_discard mnt_point" 1>&2
+		echo "Usage: _require_batched_discard mnt_point" 1>&2
 		exit 1
 	fi
 	_require_fstrim
-	$FSTRIM_PROG ${1} &>/dev/null
+	[$FSTRIM_PROG $1 > /dev/null 2>&1] || _notrun "FITRIM not supported on $1"
 }
 
 _require_dumpe2fs()
diff --git a/tests/generic/038 b/tests/generic/038
index 5db718c2..2e55c1a9 100755
--- a/tests/generic/038
+++ b/tests/generic/038
@@ -69,7 +69,6 @@ _need_to_be_root
 _supported_fs generic
 _supported_os Linux
 _require_scratch
-_require_fstrim
 
 rm -f $seqres.full
 
@@ -123,6 +122,7 @@ create_files()
 _scratch_mkfs >>$seqres.full 2>&1
 _require_fs_space $SCRATCH_MNT $((10 * 1024 * 1024))
 _scratch_mount
+_require_batched_discard $SCRATCH_MNT
 
 for ((i = 0; i < $((4 * $LOAD_FACTOR)); i++)); do
 	trim_loop &
diff --git a/tests/generic/251 b/tests/generic/251
index d88c48b9..848ee747 100755
--- a/tests/generic/251
+++ b/tests/generic/251
@@ -43,9 +43,9 @@ mypid=$$
 _supported_fs generic
 _supported_os Linux
 _require_scratch
-_require_fstrim
 _scratch_mkfs >/dev/null 2>&1
 _scratch_mount
+_require_batched_discard $SCRATCH_MNT
 
 _cleanup()
 {
@@ -150,11 +150,6 @@ function run_process() {
 nproc=20
 content=$here
 
-# Check for FITRIM support
-echo -n "Checking FITRIM support: "
-_test_batched_discard $SCRATCH_MNT || _notrun "FITRIM not supported on $SCRATCH_DEV"
-echo "done."
-
 mkdir -p $tmp
 
 (
diff --git a/tests/generic/251.out b/tests/generic/251.out
index 3017b5e2..142eb251 100644
--- a/tests/generic/251.out
+++ b/tests/generic/251.out
@@ -1,3 +1,2 @@
 QA output created by 251
-Checking FITRIM support: done.
 Running the test: done.
diff --git a/tests/generic/260 b/tests/generic/260
index 23ea40fb..312e6d20 100755
--- a/tests/generic/260
+++ b/tests/generic/260
@@ -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}')
 
diff --git a/tests/generic/288 b/tests/generic/288
index 2bde8a27..03688285 100755
--- a/tests/generic/288
+++ b/tests/generic/288
@@ -36,12 +36,11 @@ trap "exit \$status" 0 1 2 3 15
 _supported_fs generic
 _supported_os Linux
 
-_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
 
 echo "[+] Length is zero (should fail)"
 out=$("$FSTRIM_PROG" -v -o0 -l0 $SCRATCH_MNT 2>&1)