summaryrefslogtreecommitdiff
path: root/tests/qemu-iotests
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2019-05-08 14:00:44 +0200
committerKevin Wolf <kwolf@redhat.com>2019-05-10 16:45:40 +0200
commit4d231a384c5d72491e6ddc8006d6be929ca6c609 (patch)
tree260348032d2fd4b5f331cff0cbdcbb28b2b403b4 /tests/qemu-iotests
parente0c9d0c128595efd10843d2791acab650b9b9e60 (diff)
downloadqemu-4d231a384c5d72491e6ddc8006d6be929ca6c609.zip
qemu-iotests: Fix cleanup for 192
Test case 192 calls _launch_qemu, so it also needs to _cleanup_qemu when it's done, otherwise the QMP FIFOs stay around in scratch/. It also creates a temporary NBD socket that needs to be removed as well at the end of the test case. Reported-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Tested-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'tests/qemu-iotests')
-rwxr-xr-xtests/qemu-iotests/1924
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192
index 158086f9d2..61a88ac88d 100755
--- a/tests/qemu-iotests/192
+++ b/tests/qemu-iotests/192
@@ -29,7 +29,9 @@ status=1 # failure is the default!
_cleanup()
{
- _cleanup_test_img
+ _cleanup_qemu
+ _cleanup_test_img
+ rm -f "$TEST_DIR/nbd"
}
trap "_cleanup; exit \$status" 0 1 2 3 15