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, peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 09/15] qemu-iotests: Remove blkdebug.conf after tests
Date: Tue,  1 Aug 2017 16:46:26 +0200	[thread overview]
Message-ID: <20170801144632.3831-10-kwolf@redhat.com> (raw)
In-Reply-To: <20170801144632.3831-1-kwolf@redhat.com>

qemu-iotests 074 and 179 left a blkdebug.conf behind in the scratch
directory. Make sure to clean up after completing the tests.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 tests/qemu-iotests/074 | 1 +
 tests/qemu-iotests/179 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/qemu-iotests/074 b/tests/qemu-iotests/074
index aba126cb69..b17866bd34 100755
--- a/tests/qemu-iotests/074
+++ b/tests/qemu-iotests/074
@@ -32,6 +32,7 @@ _cleanup()
     echo "Cleanup"
     _cleanup_test_img
     rm "${TEST_IMG2}"
+    rm -f "$TEST_DIR/blkdebug.conf"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/179 b/tests/qemu-iotests/179
index 7bc8db8fe0..115944a753 100755
--- a/tests/qemu-iotests/179
+++ b/tests/qemu-iotests/179
@@ -30,6 +30,7 @@ status=1	# failure is the default!
 _cleanup()
 {
 	_cleanup_test_img
+    rm -f "$TEST_DIR/blkdebug.conf"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
-- 
2.13.3

  parent reply	other threads:[~2017-08-01 14:46 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-01 14:46 [Qemu-devel] [PULL 00/15] Block layer patches for 2.10.0-rc1 Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 01/15] docs: add qemu-block-drivers(7) man page Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 02/15] iotests: Fix test 156 Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 03/15] iotests: Redirect stderr to stdout in 186 Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 04/15] iotests: Check dirty bitmap statistics in 124 Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 05/15] iotests: Add test of recent fix to 'qemu-img measure' Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 06/15] block: fix dangling bs->explicit_options in block.c Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 07/15] block: fix leaks in bdrv_open_driver() Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 08/15] qemu-iotests/041: Fix leaked scratch images Kevin Wolf
2017-08-01 14:46 ` Kevin Wolf [this message]
2017-08-01 14:46 ` [Qemu-devel] [PULL 10/15] qemu-iotests/141: Fix image cleanup Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 11/15] qemu-iotests/153: Fix leaked scratch images Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 12/15] qemu-iotests/162: Fix leaked temporary files Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 13/15] qemu-iotests/063: Fix leaked image Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 14/15] qemu-iotests/059: Fix leaked image files Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 15/15] block/qapi: Remove redundant NULL check to silence Coverity Kevin Wolf
2017-08-01 16:01 ` [Qemu-devel] [PULL 00/15] Block layer patches for 2.10.0-rc1 Peter Maydell
2017-08-01 16:10   ` Kevin Wolf

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=20170801144632.3831-10-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=peter.maydell@linaro.org \
    --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.