All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH for-2.10 6/7] qemu-iotests/063: Fix leaked image
Date: Fri, 28 Jul 2017 15:14:51 +0200	[thread overview]
Message-ID: <20170728131452.15316-7-kwolf@redhat.com> (raw)
In-Reply-To: <20170728131452.15316-1-kwolf@redhat.com>

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

  parent reply	other threads:[~2017-07-28 13:15 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-28 13:14 [Qemu-devel] [PATCH for-2.10 0/7] qemu-iotests: Fix leaked temporary file fixes Kevin Wolf
2017-07-28 13:14 ` [Qemu-devel] [PATCH for-2.10 1/7] qemu-iotests/041: Fix leaked scratch images Kevin Wolf
2017-07-28 19:28   ` Eric Blake
2017-07-28 21:34   ` Jeff Cody
2017-07-28 13:14 ` [Qemu-devel] [PATCH for-2.10 2/7] qemu-iotests: Remove blkdebug.conf after tests Kevin Wolf
2017-07-28 15:33   ` Jeff Cody
2017-07-28 19:27   ` Eric Blake
2017-07-28 13:14 ` [Qemu-devel] [PATCH for-2.10 3/7] qemu-iotests/141: Fix image cleanup Kevin Wolf
2017-07-28 21:04   ` Jeff Cody
2017-07-28 13:14 ` [Qemu-devel] [PATCH for-2.10 4/7] qemu-iotests/153: Fix leaked scratch images Kevin Wolf
2017-07-28 15:37   ` Jeff Cody
2017-07-28 13:14 ` [Qemu-devel] [PATCH for-2.10 5/7] qemu-iotests/162: Fix leaked temporary files Kevin Wolf
2017-07-28 21:18   ` Jeff Cody
2017-07-28 13:14 ` Kevin Wolf [this message]
2017-07-28 21:21   ` [Qemu-devel] [PATCH for-2.10 6/7] qemu-iotests/063: Fix leaked image Jeff Cody
2017-07-28 13:14 ` [Qemu-devel] [PATCH for-2.10 7/7] qemu-iotests/059: Fix leaked image files Kevin Wolf
2017-07-28 19:33   ` Eric Blake
2017-07-28 21:39   ` Jeff Cody
2017-07-28 19:34 ` [Qemu-devel] [PATCH for-2.10 0/7] qemu-iotests: Fix leaked temporary file fixes Eric Blake

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170728131452.15316-7-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.