mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
common: Use _require_xfs_io_command() instead of helpers
Number of helpers for checking xfs_io functionality is slowly growing. But it's as easy to simply use _require_xfs_io_command() directly and just specify the command we want to check. It will also avoid the need to create helper every time we need to check a new command in xfs_io. Remove all the helpers and use _require_xfs_io_command() in the tests. Signed-off-by: Lukas Czerner <lczerner@redhat.com> Reviewed-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
committed by
Dave Chinner
parent
a841a6d0a8
commit
ce0aa2bc5c
+1
-1
@@ -44,7 +44,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
|
||||
|
||||
# real QA test starts here
|
||||
_supported_os Linux
|
||||
_require_xfs_io_falloc_zero
|
||||
_require_xfs_io_command "fzero"
|
||||
|
||||
testfile=$TEST_DIR/009.$$
|
||||
|
||||
|
||||
+4
-4
@@ -51,10 +51,10 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
|
||||
_supported_fs generic
|
||||
_supported_os Linux
|
||||
|
||||
_require_xfs_io_falloc_punch
|
||||
_require_xfs_io_falloc
|
||||
_require_xfs_io_fiemap
|
||||
_require_xfs_io_falloc_collapse
|
||||
_require_xfs_io_command "fpunch"
|
||||
_require_xfs_io_command "falloc"
|
||||
_require_xfs_io_command "fiemap"
|
||||
_require_xfs_io_command "fcollapse"
|
||||
|
||||
testfile=$TEST_DIR/$seq.$$
|
||||
|
||||
|
||||
+4
-4
@@ -51,10 +51,10 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
|
||||
_supported_fs generic
|
||||
_supported_os Linux
|
||||
|
||||
_require_xfs_io_falloc_punch
|
||||
_require_xfs_io_falloc
|
||||
_require_xfs_io_fiemap
|
||||
_require_xfs_io_falloc_collapse
|
||||
_require_xfs_io_command "fpunch"
|
||||
_require_xfs_io_command "falloc"
|
||||
_require_xfs_io_command "fiemap"
|
||||
_require_xfs_io_command "fcollapse"
|
||||
|
||||
testfile=$TEST_DIR/$seq.$$
|
||||
|
||||
|
||||
+2
-2
@@ -43,8 +43,8 @@ _supported_fs generic
|
||||
_supported_os Linux
|
||||
|
||||
_require_scratch
|
||||
_require_xfs_io_fiemap
|
||||
_require_xfs_io_falloc_collapse
|
||||
_require_xfs_io_command "fiemap"
|
||||
_require_xfs_io_command "fcollapse"
|
||||
_do_die_on_error=y
|
||||
testfile=$SCRATCH_MNT/$seq.$$
|
||||
BLOCKS=10240
|
||||
|
||||
+4
-4
@@ -51,10 +51,10 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
|
||||
_supported_fs generic
|
||||
_supported_os Linux
|
||||
|
||||
_require_xfs_io_falloc_punch
|
||||
_require_xfs_io_falloc
|
||||
_require_xfs_io_fiemap
|
||||
_require_xfs_io_falloc_collapse
|
||||
_require_xfs_io_command "fpunch"
|
||||
_require_xfs_io_command "falloc"
|
||||
_require_xfs_io_command "fiemap"
|
||||
_require_xfs_io_command "fcollapse"
|
||||
|
||||
testfile=$TEST_DIR/$seq.$$
|
||||
|
||||
|
||||
+4
-4
@@ -51,10 +51,10 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
|
||||
_supported_fs generic
|
||||
_supported_os Linux
|
||||
|
||||
_require_xfs_io_falloc_punch
|
||||
_require_xfs_io_falloc
|
||||
_require_xfs_io_fiemap
|
||||
_require_xfs_io_falloc_collapse
|
||||
_require_xfs_io_command "fpunch"
|
||||
_require_xfs_io_command "falloc"
|
||||
_require_xfs_io_command "fiemap"
|
||||
_require_xfs_io_command "fcollapse"
|
||||
|
||||
testfile=$TEST_DIR/$seq.$$
|
||||
|
||||
|
||||
+1
-1
@@ -54,7 +54,7 @@ _supported_os Linux
|
||||
|
||||
rm -f $seqres.full
|
||||
|
||||
_require_xfs_io_falloc
|
||||
_require_xfs_io_command "falloc"
|
||||
|
||||
# check there's enough freespace on $TEST_DIR ... (1GiB + 1MiB)
|
||||
avail=`df -P $TEST_DIR | awk 'END {print $4}'`
|
||||
|
||||
+1
-1
@@ -53,7 +53,7 @@ _supported_os Linux
|
||||
rm -f $seqres.full
|
||||
rm -f $TEST_DIR/ouch*
|
||||
|
||||
_require_xfs_io_falloc
|
||||
_require_xfs_io_command "falloc"
|
||||
|
||||
# Ok, off we go.
|
||||
|
||||
|
||||
+1
-1
@@ -46,7 +46,7 @@ _supported_fs generic
|
||||
_supported_os Linux
|
||||
|
||||
_require_scratch
|
||||
_require_xfs_io_falloc
|
||||
_require_xfs_io_command "falloc"
|
||||
|
||||
rm -f $seqres.full
|
||||
|
||||
|
||||
+1
-1
@@ -53,7 +53,7 @@ _supported_os Linux
|
||||
rm -f $seqres.full
|
||||
|
||||
# Sanity check to see if fallocate works
|
||||
_require_xfs_io_falloc
|
||||
_require_xfs_io_command "falloc"
|
||||
|
||||
# Check if we have good enough space available
|
||||
avail=`df -P $TEST_DIR | awk 'END {print $4}'`
|
||||
|
||||
+3
-3
@@ -46,9 +46,9 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
|
||||
_supported_fs generic
|
||||
_supported_os Linux
|
||||
|
||||
_require_xfs_io_falloc_punch
|
||||
_require_xfs_io_falloc
|
||||
_require_xfs_io_fiemap
|
||||
_require_xfs_io_command "fpunch"
|
||||
_require_xfs_io_command "falloc"
|
||||
_require_xfs_io_command "fiemap"
|
||||
|
||||
testfile=$TEST_DIR/255.$$
|
||||
|
||||
|
||||
+1
-1
@@ -46,7 +46,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
|
||||
_supported_fs generic
|
||||
_supported_os Linux
|
||||
|
||||
_require_xfs_io_falloc_punch
|
||||
_require_xfs_io_command "fpunch"
|
||||
_require_scratch
|
||||
_require_user
|
||||
|
||||
|
||||
+1
-1
@@ -48,7 +48,7 @@ _cleanup()
|
||||
_supported_fs generic
|
||||
_supported_os IRIX Linux
|
||||
_require_scratch
|
||||
_require_xfs_io_falloc
|
||||
_require_xfs_io_command "falloc"
|
||||
|
||||
echo "------------------------------"
|
||||
echo "preallocation test"
|
||||
|
||||
+2
-2
@@ -46,8 +46,8 @@ _require_scratch
|
||||
|
||||
# xfs_io is not required for this test, but it's the best way to verify
|
||||
# the test system supports fallocate() for allocation and hole punching
|
||||
_require_xfs_io_falloc
|
||||
_require_xfs_io_falloc_punch
|
||||
_require_xfs_io_command "falloc"
|
||||
_require_xfs_io_command "fpunch"
|
||||
|
||||
rm -f $seqres.full
|
||||
|
||||
|
||||
+1
-1
@@ -59,7 +59,7 @@ _require_dm_flakey
|
||||
|
||||
# xfs_io is not required for this test, but it's the best way to verify
|
||||
# the test system supports fallocate() for allocation
|
||||
_require_xfs_io_falloc
|
||||
_require_xfs_io_command "falloc"
|
||||
|
||||
[ -x $here/src/fsync-tester ] || _notrun "fsync-tester not built"
|
||||
|
||||
|
||||
+1
-1
@@ -46,7 +46,7 @@ _cleanup()
|
||||
# real QA test starts here
|
||||
_supported_fs generic
|
||||
_supported_os Linux
|
||||
_require_xfs_io_falloc
|
||||
_require_xfs_io_command "falloc"
|
||||
_require_scratch
|
||||
|
||||
# 5G in byte
|
||||
|
||||
+2
-2
@@ -45,8 +45,8 @@ _cleanup()
|
||||
_supported_fs generic
|
||||
_supported_os Linux
|
||||
|
||||
_require_xfs_io_falloc_punch
|
||||
_require_xfs_io_fiemap
|
||||
_require_xfs_io_command "fpunch"
|
||||
_require_xfs_io_command "fiemap"
|
||||
|
||||
testfile=$TEST_DIR/$seq.$$
|
||||
|
||||
|
||||
Reference in New Issue
Block a user