Message ID | 20170728131452.15316-7-kwolf@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Fri, Jul 28, 2017 at 03:14:51PM +0200, Kevin Wolf wrote: > qemu-iotests 063 left t.raw.raw1 behind in the scratch directory because > it used the wrong suffix. Make sure to clean it up after completing the > test. > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > --- > tests/qemu-iotests/063 | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063 > index 352e78c778..e4f6ea9385 100755 > --- a/tests/qemu-iotests/063 > +++ b/tests/qemu-iotests/063 > @@ -31,7 +31,7 @@ status=1 # failure is the default! > _cleanup() > { > _cleanup_test_img > - rm -f "$TEST_IMG.orig" "$TEST_IMG.raw" "$TEST_IMG.raw2" > + rm -f "$TEST_IMG.orig" "$TEST_IMG.raw1" "$TEST_IMG.raw2" > } > trap "_cleanup; exit \$status" 0 1 2 3 15 > > @@ -91,8 +91,6 @@ if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG.orig" "$TEST_IMG" >/dev > exit 1 > fi > > -rm -f "$TEST_IMG.orig" "$TEST_IMG.raw" "$TEST_IMG.raw2" > - > echo "*** done" > rm -f $seq.full > status=0 > -- > 2.13.3 > > Reviewed-by: Jeff Cody <jcody@redhat.com>
diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063 index 352e78c778..e4f6ea9385 100755 --- a/tests/qemu-iotests/063 +++ b/tests/qemu-iotests/063 @@ -31,7 +31,7 @@ status=1 # failure is the default! _cleanup() { _cleanup_test_img - rm -f "$TEST_IMG.orig" "$TEST_IMG.raw" "$TEST_IMG.raw2" + rm -f "$TEST_IMG.orig" "$TEST_IMG.raw1" "$TEST_IMG.raw2" } trap "_cleanup; exit \$status" 0 1 2 3 15 @@ -91,8 +91,6 @@ if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG.orig" "$TEST_IMG" >/dev exit 1 fi -rm -f "$TEST_IMG.orig" "$TEST_IMG.raw" "$TEST_IMG.raw2" - echo "*** done" rm -f $seq.full status=0
qemu-iotests 063 left t.raw.raw1 behind in the scratch directory because it used the wrong suffix. Make sure to clean it up after completing the test. Signed-off-by: Kevin Wolf <kwolf@redhat.com> --- tests/qemu-iotests/063 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)