On Tue, Feb 13, 2018 at 05:12:03PM +0800, Eryu Guan wrote: > Also remove redundant status checks of _scratch_mount. > > Signed-off-by: Eryu Guan <eguan@xxxxxxxxxx> > --- <skipping to the generic and xfs tests> > diff --git a/tests/generic/054 b/tests/generic/054 > index 12f471a19090..84b8271a11bd 100755 > --- a/tests/generic/054 > +++ b/tests/generic/054 > @@ -83,7 +83,7 @@ for s in sync nosync ; do > > # mount the FS > _echofull "mount" > - if ! _scratch_mount >>$seqres.full 2>&1; then > + if ! _scratch_mount_nocheck >>$seqres.full 2>&1; then > _echofull "mount failed: $MOUNT_OPTIONS" > continue > fi > @@ -118,7 +118,7 @@ for s in sync nosync ; do > _print_logstate > > _echofull "mount with replay" > - _scratch_mount >>$seqres.full 2>&1 \ > + _scratch_mount_nocheck >>$seqres.full 2>&1 \ > || _fail "mount failed: $MOUNT_OPTIONS" nocheck || fail ?? I wonder if the fail message should always spit out the mount options that were tried? > diff --git a/tests/generic/068 b/tests/generic/068 > index bd12278cdd25..91b327866c54 100755 > --- a/tests/generic/068 > +++ b/tests/generic/068 > @@ -62,7 +62,7 @@ echo "*** MKFS ***" >>$seqres.full > echo "" >>$seqres.full > _scratch_mkfs >>$seqres.full 2>&1 \ > || _fail "mkfs failed" > -_scratch_mount >>$seqres.full 2>&1 \ > +_scratch_mount_nocheck >>$seqres.full 2>&1 \ > || _fail "mount failed" Can this remain _scratch_mount, since we _fail anyway? (There are more of these scattered throughout.) --D -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
