On Mon, Jan 13, 2020 at 11:24:09AM +0800, Murphy Zhou wrote: > Usually the _mkfs helper will cleanup these directories at the > beginning of testcase. However, when testing on NFS, the cleanup > could be very slow and it is confusing that: We have already > started to run generic/176 but we get stuck in _mkfs, cleaning > up files left by the previous testcase generic/175. Isn't this a general problem with the way nfs handles "mkfs" on scratch devices? So you'd want to fix this once by doing the cleanup between tests instead of playing whackamole with whatever crazy file tests we think of next? > To be clear, cleanup testdir before exit. > > Signed-off-by: Murphy Zhou <jencce.kernel@xxxxxxxxx> > --- > tests/generic/175 | 1 + > tests/generic/176 | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/tests/generic/175 b/tests/generic/175 > index 79e5b3d6..bd966a28 100755 > --- a/tests/generic/175 > +++ b/tests/generic/175 > @@ -61,6 +61,7 @@ bytes=$((blks * blksz)) > echo "reflinking $blks blocks, $bytes bytes" >> "$seqres.full" > _reflink_range "$testdir/file1" 0 "$testdir/file2" 0 $bytes >> "$seqres.full" > > +rm -rf $testdir Or put another way, this probably ought to be in _try_wipe_scratch_devs() --D > # success, all done > status=0 > exit > diff --git a/tests/generic/176 b/tests/generic/176 > index a084578a..bc83762e 100755 > --- a/tests/generic/176 > +++ b/tests/generic/176 > @@ -73,6 +73,7 @@ bytes=$((blocks_needed * blksz)) > echo "reflinking $((blocks_needed / 2)) blocks, $((bytes / 2)) bytes" >> "$seqres.full" > _reflink_range "$testdir/file1" 0 "$testdir/file2" 0 $bytes >> "$seqres.full" > > +rm -rf $testdir > # success, all done > status=0 > exit > -- > 2.20.1 >
