From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49620) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtGnC-0000hy-Gq for qemu-devel@nongnu.org; Tue, 25 Nov 2014 09:08:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XtGn6-0006kJ-RA for qemu-devel@nongnu.org; Tue, 25 Nov 2014 09:08:34 -0500 From: Max Reitz Date: Tue, 25 Nov 2014 15:08:00 +0100 Message-Id: <1416924485-13304-8-git-send-email-mreitz@redhat.com> In-Reply-To: <1416924485-13304-1-git-send-email-mreitz@redhat.com> References: <1416924485-13304-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 07/12] iotests: Only kill NBD server if it runs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Lieven , qemu-stable@nongnu.org, Markus Armbruster , Stefan Hajnoczi , Max Reitz 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 --- tests/qemu-iotests/common.rc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 9c49deb..f2554ec 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -175,7 +175,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) -- 1.9.3