common: Mark tests which use direct I/O with _requires_odirect

There were a number of tests that use Direct I/O that weren't testing
to make sure O_DIRECT is actually supported.  This will be important
for avoiding false positives when testing ext4 encryption (which does
not support DIO for obvious reasons).

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/tests/ext4/301 b/tests/ext4/301
index 4e21acd858d03956b7f04b593b2ea8a9fca602a5..8e051f99d7170230bd0fc96470c459e071eb5d39 100755 (executable)
--- a/tests/ext4/301
+++ b/tests/ext4/301
@@ -42,6 +42,7 @@ _supported_os Linux
 _supported_fs ext4
 _require_scratch
 _require_defrag
+_require_odirect
 
 NUM_JOBS=$((4*LOAD_FACTOR))
 BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV`

diff --git a/tests/ext4/302 b/tests/ext4/302
index 6ed8ce0347e3871d1e427c57389c40e1d01ff3a2..e45dfb8180d8379b4a4c7f91a504225b041b5532 100755 (executable)
--- a/tests/ext4/302
+++ b/tests/ext4/302
@@ -43,6 +43,7 @@ _supported_os Linux
 _supported_fs ext4
 _require_scratch
 _require_defrag
+_require_odirect
 
 BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV`
 # We need space for 2 files (test file, and donor one)

diff --git a/tests/ext4/303 b/tests/ext4/303
index b925aa3647da911099a2c287f7834ed840d60809..3519002d67a27f6e8ae84a53e1bec25136b36d76 100755 (executable)
--- a/tests/ext4/303
+++ b/tests/ext4/303
@@ -43,6 +43,7 @@ _supported_os Linux
 _supported_fs ext4
 _require_scratch
 _require_defrag
+_require_odirect
 
 BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV`
 # We need space for 3 files (one donor file and two test files)

diff --git a/tests/ext4/304 b/tests/ext4/304
index ceb82d6aef7781efb958ee81e3764920460fe67f..952bbb92675990b987f535d5c2228f93aedd5200 100755 (executable)
--- a/tests/ext4/304
+++ b/tests/ext4/304
@@ -44,6 +44,7 @@ _supported_os Linux
 _supported_fs ext4
 _require_scratch
 _require_defrag
+_require_odirect
 
 BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV`
 # We need space for 2 files (test file, and donor one)

diff --git a/tests/generic/095 b/tests/generic/095
index 1123080443ed7b8563567abcdcbad932b1b30e88..c656ef12f4aed6123e32e243b50896708b16502f 100755 (executable)
--- a/tests/generic/095
+++ b/tests/generic/095
@@ -44,6 +44,7 @@ _cleanup()
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_odirect
 
 iodepth=$((16 * LOAD_FACTOR))
 iodepth_batch=$((8 * LOAD_FACTOR))

diff --git a/tests/generic/250 b/tests/generic/250
index b0b175abf9b9da77bd95d47afcf32e550d023523..6d15de2bb5e5942e5a63e1410710bacf54648c32 100755 (executable)
--- a/tests/generic/250
+++ b/tests/generic/250
@@ -47,6 +47,7 @@ _supported_os Linux
 _require_scratch
 _require_dm_target error
 _require_xfs_io_command "falloc"
+_require_odirect
 
 rm -f $seqres.full
 

diff --git a/tests/generic/252 b/tests/generic/252
index fc9a723bb73a32330d4b5e31c9f610fdcd635100..ffedd569ec03bd272e47c020cb20b38aaf037086 100755 (executable)
--- a/tests/generic/252
+++ b/tests/generic/252
@@ -47,7 +47,7 @@ _supported_os Linux
 _require_scratch
 _require_dm_target error
 _require_xfs_io_command "falloc"
-_require_test_program "aio-dio-regress/aiocp"
+_require_aiodio "aiocp"
 AIO_TEST="src/aio-dio-regress/aiocp"
 
 rm -f $seqres.full

diff --git a/tests/generic/331 b/tests/generic/331
index 8d8fd6a611e8149c050b00712e0bdf1de40842b8..9b914594e992684fab9fc6fa7e590a977cc6ad0f 100755 (executable)
--- a/tests/generic/331
+++ b/tests/generic/331
@@ -47,7 +47,7 @@ _supported_os Linux
 _require_scratch_reflink
 _require_cp_reflink
 _require_dm_target error
-_require_test_program "aio-dio-regress/aiocp"
+_require_aiodio "aiocp"
 AIO_TEST="src/aio-dio-regress/aiocp"
 
 rm -f $seqres.full

diff --git a/tests/generic/332 b/tests/generic/332
index b805bbd7184ba5f5f2aa3e18b0de37905a7e3956..1fb56113c5279abde5cbf8e6597ef5527aecb988 100755 (executable)
--- a/tests/generic/332
+++ b/tests/generic/332
@@ -44,7 +44,7 @@ _cleanup()
 _supported_os Linux
 _require_scratch_reflink
 _require_cp_reflink
-_require_test_program "aio-dio-regress/aiocp"
+_require_aiodio "aiocp"
 AIO_TEST="src/aio-dio-regress/aiocp"
 
 rm -f $seqres.full