summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2014-12-02 18:32:48 +0100
committerMichael Roth <mdroth@linux.vnet.ibm.com>2015-01-07 15:08:47 -0600
commite6c172ad9e220e9ee013078502808b90aad12302 (patch)
tree7cc1c6f42b1292b99e4932d0131565659b0c66c9
parent07ede68671f8b14fd42b72a43bd95af7d45f3611 (diff)
downloadqemu-e6c172ad9e220e9ee013078502808b90aad12302.tar.gz
iotests: Only kill NBD server if it runs
There may be NBD tests which do not create a sample image and simply test whether wrong usage of the protocol is rejected as expected. In this case, there will be no NBD server and trying to kill it during clean-up will fail. Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> (cherry picked from commit f798068c565918ead63218d083ff814b7635be72) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r--tests/qemu-iotests/common.rc4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index e0ea7e3a7d..e7760a23f6 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -189,7 +189,9 @@ _cleanup_test_img()
case "$IMGPROTO" in
nbd)
- kill $QEMU_NBD_PID
+ if [ -n "$QEMU_NBD_PID" ]; then
+ kill $QEMU_NBD_PID
+ fi
rm -f "$TEST_IMG_FILE"
;;
file)