generic/{628,629}: fix order of _require_scratch* and _require_dm_target

Test cases with dm_target shall call _require_scratch* before
_require_dm_target to ensure that valid SCRATCH_DEV is available for
dm_target. However, the test cases generic/628 and generic/629 call
_require_dm_target before _require_scratch*, then unexpected failure
was reported when SCRATCH_DEV is not specified. Fix the order of
function calls.

Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/tests/generic/628 b/tests/generic/628
index 2ccbbbdc9a0d5c7f6ae55f04df13b1bfd9370e12..7dc6dfcdd2ece8d6c143d867e46323252273de89 100755 (executable)
--- a/tests/generic/628
+++ b/tests/generic/628
@@ -29,8 +29,8 @@ _cleanup()
 
 # real QA test starts here
 _supported_fs generic
-_require_dm_target error
 _require_scratch_reflink
+_require_dm_target error
 _require_xfs_io_command "chattr" "s"
 _require_cp_reflink
 

diff --git a/tests/generic/629 b/tests/generic/629
index abfa90abc3104e89239314a40177b0a8e551113a..f501555e3f10319916aeb6889634d1be543c32eb 100755 (executable)
--- a/tests/generic/629
+++ b/tests/generic/629
@@ -28,10 +28,10 @@ _cleanup()
 
 # real QA test starts here
 _supported_fs generic
+_require_scratch
 _require_dm_target error
 _require_xfs_io_command "chattr" "s"
 _require_xfs_io_command "copy_range"
-_require_scratch
 
 # Format filesystem and set up quota limits
 _scratch_mkfs > $seqres.full