On Sat, Oct 27, 2018 at 09:55:20AM +0800, Chao Yu wrote: > _require_btime() just check inode creation time feature on TEST_DIR > mountpoint, but generic/508 needs to do that check on SCRATCH_MNT > mountpoint. Let's add _require_scratch_btime() for that, meanwhile > handling scratch_{mkfs,mount,umount} inside the function to decouple > with caller. > > Signed-off-by: Chao Yu <yuchao0@xxxxxxxxxx> > --- > v3: > - hanlde scratch mkfs/mount/umount inside _require_scratch_btime > - relocate _require_scratch_btime > common/rc | 14 ++++++++++++++ > tests/generic/508 | 2 +- > 2 files changed, 15 insertions(+), 1 deletion(-) > > diff --git a/common/rc b/common/rc > index b4987a9cd7f7..a882fada7d02 100644 > --- a/common/rc > +++ b/common/rc > @@ -3851,6 +3851,20 @@ _require_btime() > rm -f $TEST_DIR/test_creation_time > } > > +_require_scratch_btime() > +{ > + _require_scratch > + _scratch_mkfs > /dev/null 2>&1 > + _scratch_mount > + > + $XFS_IO_PROG -f $SCRATCH_MNT/test_creation_time -c "statx -v" \ > + | grep btime >>$seqres.full 2>&1 || \ > + _notrun "inode creation time not supported by this filesystem" > + rm -f $SCRATCH_MNT/test_creation_time No need to remove that file - it's going to get mkfs'd again, anyway. Otherwise looks fine. I'm not a fan of all these require_scratch rules having to run mkfs, but I can live with it. Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx> -- Dave Chinner david@xxxxxxxxxxxxx