Commit ecfa1854 authored by Jeff Cody's avatar Jeff Cody
Browse files

qemu-iotests: _cleanup_qemu must be called on exit 



For the tests that use the common.qemu functions for running a QEMU
process, _cleanup_qemu must be called in the exit function.

If it is not, if the qemu process aborts, then not all of the droppings
are cleaned up (e.g. pidfile, fifos).

This updates those tests that did not have a cleanup in qemu-iotests.

(I swapped spaces for tabs in test 102 as well)

Reported-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarJeff Cody <jcody@redhat.com>
Message-id: d59c2f6ad6c1da8b9b3c7f357c94a7122ccfc55a.1492544096.git.jcody@redhat.com
parent 56e7cf8d

tests/qemu-iotests/028

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ status=1 # failure is the default! 


_cleanup()

{

    _cleanup_qemu

    rm -f "${TEST_IMG}.copy"

    _cleanup_test_img

}

tests/qemu-iotests/094

+8 −3
Original line number Diff line number Diff line
@@ -27,7 +27,14 @@ echo "QA output created by $seq" 
here="$PWD"

status=1	# failure is the default!



trap "exit \$status" 0 1 2 3 15

_cleanup()

{

    _cleanup_qemu

    _cleanup_test_img

    rm -f "$TEST_DIR/source.$IMGFMT"

}



trap "_cleanup; exit \$status" 0 1 2 3 15



# get standard environment, filters and checks

. ./common.rc
@@ -73,8 +80,6 @@ _send_qemu_cmd $QEMU_HANDLE \ 


wait=1 _cleanup_qemu



_cleanup_test_img

rm -f "$TEST_DIR/source.$IMGFMT"



# success, all done

echo '*** done'

tests/qemu-iotests/102

+3 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ status=1 # failure is the default! 


_cleanup()

{

    _cleanup_qemu

    _cleanup_test_img

}

trap "_cleanup; exit \$status" 0 1 2 3 15

tests/qemu-iotests/109

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ status=1 # failure is the default! 


_cleanup()

{

    _cleanup_qemu

    rm -f $TEST_IMG.src

	_cleanup_test_img

}

tests/qemu-iotests/117

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ status=1 # failure is the default! 


_cleanup()

{

    _cleanup_qemu

	_cleanup_test_img

}

trap "_cleanup; exit \$status" 0 1 2 3 15