From 5ca088bdd2dfca5f0512223fe1ad05d9e2909f08 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Thu, 25 Aug 2016 16:28:25 -0700 Subject: [PATCH] tests/xfs: don't run tests if cowextsize isn't present Some of the tests forgot to check that xfs_io has a cowextsize command, so fix that here. Signed-off-by: Darrick J. Wong Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- tests/xfs/215 | 1 + tests/xfs/218 | 1 + tests/xfs/219 | 1 + tests/xfs/221 | 1 + tests/xfs/223 | 1 + tests/xfs/224 | 1 + tests/xfs/225 | 1 + tests/xfs/226 | 1 + tests/xfs/228 | 1 + tests/xfs/230 | 1 + tests/xfs/231 | 1 + tests/xfs/232 | 1 + tests/xfs/243 | 1 + tests/xfs/248 | 1 + tests/xfs/249 | 1 + tests/xfs/251 | 1 + tests/xfs/254 | 1 + tests/xfs/255 | 1 + tests/xfs/256 | 1 + tests/xfs/257 | 1 + tests/xfs/258 | 1 + tests/xfs/315 | 1 + tests/xfs/326 | 1 + 23 files changed, 23 insertions(+) diff --git a/tests/xfs/215 b/tests/xfs/215 index 7a517d7f..b9c9ab44 100755 --- a/tests/xfs/215 +++ b/tests/xfs/215 @@ -50,6 +50,7 @@ _cleanup() _supported_os Linux _require_scratch_reflink _require_xfs_io_command "falloc" +_require_xfs_io_command "cowextsize" _require_odirect rm -f $seqres.full diff --git a/tests/xfs/218 b/tests/xfs/218 index 0ab4102c..887a1359 100755 --- a/tests/xfs/218 +++ b/tests/xfs/218 @@ -50,6 +50,7 @@ _cleanup() _supported_os Linux _require_scratch_reflink _require_xfs_io_command "falloc" +_require_xfs_io_command "cowextsize" rm -f $seqres.full diff --git a/tests/xfs/219 b/tests/xfs/219 index df57e07a..5ae0714c 100755 --- a/tests/xfs/219 +++ b/tests/xfs/219 @@ -50,6 +50,7 @@ _cleanup() _supported_os Linux _require_scratch_reflink _require_xfs_io_command "falloc" +_require_xfs_io_command "cowextsize" _require_odirect rm -f $seqres.full diff --git a/tests/xfs/221 b/tests/xfs/221 index 03d81ac6..3afc75f2 100755 --- a/tests/xfs/221 +++ b/tests/xfs/221 @@ -50,6 +50,7 @@ _cleanup() _supported_os Linux _require_scratch_reflink _require_xfs_io_command "falloc" +_require_xfs_io_command "cowextsize" rm -f $seqres.full diff --git a/tests/xfs/223 b/tests/xfs/223 index 7c990a27..3f34bcfa 100755 --- a/tests/xfs/223 +++ b/tests/xfs/223 @@ -51,6 +51,7 @@ _cleanup() _supported_os Linux _require_scratch_reflink _require_xfs_io_command "falloc" +_require_xfs_io_command "cowextsize" _require_odirect rm -f $seqres.full diff --git a/tests/xfs/224 b/tests/xfs/224 index bf33d1f1..91033fa9 100755 --- a/tests/xfs/224 +++ b/tests/xfs/224 @@ -51,6 +51,7 @@ _cleanup() _supported_os Linux _require_scratch_reflink _require_xfs_io_command "falloc" +_require_xfs_io_command "cowextsize" rm -f $seqres.full diff --git a/tests/xfs/225 b/tests/xfs/225 index 749816f0..22604419 100755 --- a/tests/xfs/225 +++ b/tests/xfs/225 @@ -50,6 +50,7 @@ _cleanup() _supported_os Linux _require_scratch_reflink _require_xfs_io_command "falloc" +_require_xfs_io_command "cowextsize" _require_odirect rm -f $seqres.full diff --git a/tests/xfs/226 b/tests/xfs/226 index bb94d246..ac702396 100755 --- a/tests/xfs/226 +++ b/tests/xfs/226 @@ -50,6 +50,7 @@ _cleanup() _supported_os Linux _require_scratch_reflink _require_xfs_io_command "falloc" +_require_xfs_io_command "cowextsize" rm -f $seqres.full diff --git a/tests/xfs/228 b/tests/xfs/228 index df1fd7aa..65d7f513 100755 --- a/tests/xfs/228 +++ b/tests/xfs/228 @@ -54,6 +54,7 @@ _cleanup() _supported_os Linux _require_scratch_reflink _require_xfs_io_command "falloc" +_require_xfs_io_command "cowextsize" _require_xfs_io_command "fpunch" _require_cp_reflink _require_odirect diff --git a/tests/xfs/230 b/tests/xfs/230 index 73f599af..73c62674 100755 --- a/tests/xfs/230 +++ b/tests/xfs/230 @@ -54,6 +54,7 @@ _cleanup() _supported_os Linux _require_scratch_reflink _require_xfs_io_command "falloc" +_require_xfs_io_command "cowextsize" _require_xfs_io_command "fpunch" _require_cp_reflink _require_odirect diff --git a/tests/xfs/231 b/tests/xfs/231 index 166f6b0e..d89139a9 100755 --- a/tests/xfs/231 +++ b/tests/xfs/231 @@ -51,6 +51,7 @@ _supported_os Linux _supported_fs xfs _require_scratch_reflink _require_cp_reflink +_require_xfs_io_command "cowextsize" _require_fiemap old_cow_lifetime=$(cat /proc/sys/fs/xfs/speculative_cow_prealloc_lifetime) diff --git a/tests/xfs/232 b/tests/xfs/232 index 0008dbfd..2438f1fd 100755 --- a/tests/xfs/232 +++ b/tests/xfs/232 @@ -50,6 +50,7 @@ _cleanup() # real QA test starts here _supported_os Linux _supported_fs xfs +_require_xfs_io_command "cowextsize" _require_scratch_reflink _require_cp_reflink _require_fiemap diff --git a/tests/xfs/243 b/tests/xfs/243 index f6a86924..0bb69c4e 100755 --- a/tests/xfs/243 +++ b/tests/xfs/243 @@ -55,6 +55,7 @@ _supported_os Linux _supported_fs xfs _require_scratch_reflink _require_xfs_io_command "falloc" +_require_xfs_io_command "cowextsize" _require_xfs_io_command "fpunch" _require_xfs_io_command "bmap" "-c" _require_cp_reflink diff --git a/tests/xfs/248 b/tests/xfs/248 index 7e25258a..471205c9 100755 --- a/tests/xfs/248 +++ b/tests/xfs/248 @@ -51,6 +51,7 @@ _cleanup() _supported_os Linux _require_scratch_reflink _require_xfs_io_command "falloc" +_require_xfs_io_command "cowextsize" rm -f $seqres.full diff --git a/tests/xfs/249 b/tests/xfs/249 index b82d89cb..0a7fbf15 100755 --- a/tests/xfs/249 +++ b/tests/xfs/249 @@ -51,6 +51,7 @@ _cleanup() _supported_os Linux _require_scratch_reflink _require_xfs_io_command "falloc" +_require_xfs_io_command "cowextsize" _require_odirect rm -f $seqres.full diff --git a/tests/xfs/251 b/tests/xfs/251 index 4f74772d..48a027c7 100755 --- a/tests/xfs/251 +++ b/tests/xfs/251 @@ -53,6 +53,7 @@ _cleanup() _supported_os Linux _require_scratch_reflink _require_xfs_io_command "falloc" +_require_xfs_io_command "cowextsize" rm -f $seqres.full diff --git a/tests/xfs/254 b/tests/xfs/254 index c8ac4123..ac87e49e 100755 --- a/tests/xfs/254 +++ b/tests/xfs/254 @@ -53,6 +53,7 @@ _cleanup() _supported_os Linux _require_scratch_reflink _require_xfs_io_command "falloc" +_require_xfs_io_command "cowextsize" _require_odirect rm -f $seqres.full diff --git a/tests/xfs/255 b/tests/xfs/255 index 93ad13eb..97cbb77b 100755 --- a/tests/xfs/255 +++ b/tests/xfs/255 @@ -53,6 +53,7 @@ _cleanup() _supported_os Linux _require_scratch_reflink _require_xfs_io_command "falloc" +_require_xfs_io_command "cowextsize" rm -f $seqres.full diff --git a/tests/xfs/256 b/tests/xfs/256 index d5cf71b8..a182953d 100755 --- a/tests/xfs/256 +++ b/tests/xfs/256 @@ -53,6 +53,7 @@ _cleanup() _supported_os Linux _require_scratch_reflink _require_xfs_io_command "falloc" +_require_xfs_io_command "cowextsize" _require_odirect rm -f $seqres.full diff --git a/tests/xfs/257 b/tests/xfs/257 index 624f5e38..1fc401b5 100755 --- a/tests/xfs/257 +++ b/tests/xfs/257 @@ -54,6 +54,7 @@ _cleanup() _supported_os Linux _require_scratch_reflink _require_xfs_io_command "falloc" +_require_xfs_io_command "cowextsize" rm -f $seqres.full diff --git a/tests/xfs/258 b/tests/xfs/258 index 243e853b..a3ffc899 100755 --- a/tests/xfs/258 +++ b/tests/xfs/258 @@ -54,6 +54,7 @@ _cleanup() _supported_os Linux _require_scratch_reflink _require_xfs_io_command "falloc" +_require_xfs_io_command "cowextsize" _require_odirect rm -f $seqres.full diff --git a/tests/xfs/315 b/tests/xfs/315 index 62d7fcfa..6170540c 100755 --- a/tests/xfs/315 +++ b/tests/xfs/315 @@ -49,6 +49,7 @@ _supported_fs xfs _require_cp_reflink _require_scratch_reflink _require_error_injection +_require_xfs_io_command "cowextsize" _require_xfs_io_error_injection "free_extent" rm -f $seqres.full diff --git a/tests/xfs/326 b/tests/xfs/326 index 2cd6eda0..36bdcf48 100755 --- a/tests/xfs/326 +++ b/tests/xfs/326 @@ -50,6 +50,7 @@ _supported_os Linux _supported_fs xfs _require_cp_reflink _require_scratch_reflink +_require_xfs_io_command "cowextsize" _require_xfs_io_error_injection "refcount_finish_one" rm -f $seqres.full -- 2.39.5