Message ID | 20220517070111.1381936-7-david@fromorbit.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | fstests: fixes and more fixes... | expand |
On Tue, May 17, 2022 at 05:01:05PM +1000, Dave Chinner wrote: > From: Dave Chinner <dchinner@redhat.com> > > Don't clean up image files - leave them laying around on the test > device so that when the test fails there's a corpse left behind to > post-mortem.... > > Signed-off-by: Dave Chinner <dchinner@redhat.com> I guess I missed this one last time Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > --- > tests/xfs/148 | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/tests/xfs/148 b/tests/xfs/148 > index 9427aff0..8d50a642 100755 > --- a/tests/xfs/148 > +++ b/tests/xfs/148 > @@ -16,7 +16,7 @@ _cleanup() > cd / > $UMOUNT_PROG $mntpt > /dev/null 2>&1 > test -n "$loopdev" && _destroy_loop_device $loopdev > /dev/null 2>&1 > - rm -r -f $imgfile $mntpt $tmp.* > + rm -r -f $tmp.* > } > > # Import common functions. > @@ -38,6 +38,8 @@ nullstr="too_many_beans" > slashstr="are_bad_for_you" > test_names=("something" "$nullstr" "$slashstr" "another") > > +rm -f $imgfile $imgfile.old > + > # Format image file w/o crcs so we can sed the image file > $XFS_IO_PROG -f -c 'truncate 40m' $imgfile > loopdev=$(_create_loop_device $imgfile) > @@ -91,7 +93,6 @@ sed -b \ > -i $imgfile > test "$(md5sum < $imgfile)" != "$(md5sum < $imgfile.old)" || > _fail "sed failed to change the image file?" > -rm -f $imgfile.old > loopdev=$(_create_loop_device $imgfile) > _mount $loopdev $mntpt > > -- > 2.35.1 >
diff --git a/tests/xfs/148 b/tests/xfs/148 index 9427aff0..8d50a642 100755 --- a/tests/xfs/148 +++ b/tests/xfs/148 @@ -16,7 +16,7 @@ _cleanup() cd / $UMOUNT_PROG $mntpt > /dev/null 2>&1 test -n "$loopdev" && _destroy_loop_device $loopdev > /dev/null 2>&1 - rm -r -f $imgfile $mntpt $tmp.* + rm -r -f $tmp.* } # Import common functions. @@ -38,6 +38,8 @@ nullstr="too_many_beans" slashstr="are_bad_for_you" test_names=("something" "$nullstr" "$slashstr" "another") +rm -f $imgfile $imgfile.old + # Format image file w/o crcs so we can sed the image file $XFS_IO_PROG -f -c 'truncate 40m' $imgfile loopdev=$(_create_loop_device $imgfile) @@ -91,7 +93,6 @@ sed -b \ -i $imgfile test "$(md5sum < $imgfile)" != "$(md5sum < $imgfile.old)" || _fail "sed failed to change the image file?" -rm -f $imgfile.old loopdev=$(_create_loop_device $imgfile) _mount $loopdev $mntpt