From: David Sterba <dsterba@suse.com>
Date: Thu, 25 Apr 2019 17:31:30 +0000 (+0200)
Subject: generic/487: reorder logdev detection after filesystem detection
X-Git-Tag: v2022.05.01~1178
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=55f4ad17f3e403d2f51f9bd014492fdb7b44212e;p=users%2Fhch%2Fxfstests-dev.git

generic/487: reorder logdev detection after filesystem detection

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>
---

diff --git a/tests/generic/487 b/tests/generic/487
index 8952284cf..75db3bfb1 100755
--- a/tests/generic/487
+++ b/tests/generic/487
@@ -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