From: Dave Chinner <dchinner@xxxxxxxxxx> Just little things I've found that should be cleaned up. Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> --- tests/generic/066 | 3 +++ tests/generic/321 | 4 +++- tests/xfs/051 | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tests/generic/066 b/tests/generic/066 index 37d04e069..9e4047a11 100755 --- a/tests/generic/066 +++ b/tests/generic/066 @@ -24,6 +24,7 @@ _begin_fstest auto quick attr metadata log _cleanup() { _cleanup_flakey + cd / rm -f $tmp.* } @@ -88,5 +89,7 @@ _flakey_drop_and_remount echo "xattr names and values after second fsync log replay:" _getfattr --absolute-names --dump $SCRATCH_MNT/foobar | _filter_scratch +_unmount_flakey + status=0 exit diff --git a/tests/generic/321 b/tests/generic/321 index 73a892334..df8f13597 100755 --- a/tests/generic/321 +++ b/tests/generic/321 @@ -13,6 +13,8 @@ _begin_fstest auto quick metadata log _cleanup() { _cleanup_flakey + cd / + rm -f $tmp.* } # Import common functions. @@ -57,7 +59,7 @@ _rename_test() $XFS_IO_PROG -c "fsync" $SCRATCH_MNT/bar $XFS_IO_PROG -c "fsync" $SCRATCH_MNT/bar/foo - _flakey_drop_and_remount\ + _flakey_drop_and_remount _ls_l $SCRATCH_MNT | tail -n +2 | awk '{ print $1, $9 }' _ls_l $SCRATCH_MNT/bar | tail -n +2 | awk '{ print $1, $9 }' diff --git a/tests/xfs/051 b/tests/xfs/051 index fe3d75cab..ddc28ac97 100755 --- a/tests/xfs/051 +++ b/tests/xfs/051 @@ -11,6 +11,13 @@ . ./common/preamble _begin_fstest shutdown auto log metadata +_cleanup() +{ + _cleanup_flakey + cd / + rm -f $tmp.* +} + # Import common functions. . ./common/dmflakey -- 2.45.2