mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-iotests: _cleanup_qemu must be called on exit

Browse Source 
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: Eric Blake <eblake@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Message-id: d59c2f6ad6c1da8b9b3c7f357c94a7122ccfc55a.1492544096.git.jcody@redhat.com
This commit is contained in:
Jeff Cody 2017-04-18 15:42:41 -04:00
parent 56e7cf8df0
commit ecfa185400
10 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/qemu-iotests/028
View File

@ -32,6 +32,7 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_qemu
rm -f "${TEST_IMG}.copy"
_cleanup_test_img
}

11
tests/qemu-iotests/094
View File

@ -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'

5
tests/qemu-iotests/102
View File

@ -25,11 +25,12 @@ seq=$(basename $0)
echo "QA output created by $seq"
here=$PWD
status=1 # failure is the default!
status=1 # failure is the default!
_cleanup()
{
_cleanup_test_img
_cleanup_qemu
_cleanup_test_img
}
trap "_cleanup; exit \$status" 0 1 2 3 15

1
tests/qemu-iotests/109
View File

@ -29,6 +29,7 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_qemu
rm -f $TEST_IMG.src
_cleanup_test_img
}

1
tests/qemu-iotests/117
View File

@ -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

1
tests/qemu-iotests/130
View File

@ -31,6 +31,7 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_qemu
_cleanup_test_img
}
trap "_cleanup; exit \$status" 0 1 2 3 15

1
tests/qemu-iotests/140
View File

@ -33,6 +33,7 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_qemu
_cleanup_test_img
rm -f "$TEST_DIR/nbd"
}

1
tests/qemu-iotests/141
View File

@ -29,6 +29,7 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_qemu
_cleanup_test_img
rm -f "$TEST_DIR/{b,m,o}.$IMGFMT"
}

1
tests/qemu-iotests/143
View File

@ -29,6 +29,7 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_qemu
rm -f "$TEST_DIR/nbd"
}
trap "_cleanup; exit \$status" 0 1 2 3 15

1
tests/qemu-iotests/156
View File

@ -37,6 +37,7 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_qemu
rm -f "$TEST_IMG{,.target}{,.backing,.overlay}"
}
trap "_cleanup; exit \$status" 0 1 2 3 15