]> www.infradead.org Git - users/hch/xfstests-dev.git/commitdiff
generic/487: reorder logdev detection after filesystem detection
authorDavid Sterba <dsterba@suse.com>
Thu, 25 Apr 2019 17:31:30 +0000 (19:31 +0200)
committerEryu Guan <guaneryu@gmail.com>
Fri, 26 Apr 2019 03:18:16 +0000 (11:18 +0800)
If SCRATCH_LOGDEV variable is unset, the _require_logdev check fails
earlier than the following check that decides that this test should not
be run on 'btrfs'.

Signed-off-by: David Sterba <dsterba@suse.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
tests/generic/487

index 8952284cf66fa2e67e938a1966bc4ed7b536b65f..75db3bfb1333ed3f8b2add301ebb1d9682f7f336 100755 (executable)
@@ -36,7 +36,6 @@ _require_scratch_nocheck
 # This test uses "dm" without taking into account the data could be on
 # realtime subvolume, thus the test will fail with rtinherit=1
 _require_no_rtinherit
-_require_logdev
 
 sflag='-s'
 case $FSTYP in
@@ -47,6 +46,7 @@ case $FSTYP in
                 ;;
 esac
 
+_require_logdev
 _require_dm_target error
 
 rm -f $seqres.full