@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -30,12 +30,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,13 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
- true
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -29,12 +29,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -29,12 +29,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,13 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
- true
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -29,14 +29,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
- rm -f "$TEST_IMG.base"
- rm -f "$TEST_IMG.orig"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,14 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
- rm -f "$TEST_IMG.base"
- rm -f "$TEST_IMG.orig"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -29,12 +29,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,14 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
- rm -f "$TEST_DIR/t.$IMGFMT.base_old"
- rm -f "$TEST_DIR/t.$IMGFMT.base_new"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,13 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
- rm "$TEST_DIR/blkdebug.conf"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -30,14 +30,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_qemu
- rm -f "${TEST_IMG}.copy"
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,13 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- rm -f $TEST_IMG.snap
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -29,12 +29,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -28,12 +28,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -30,12 +30,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -30,12 +30,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,13 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
- rm -f "$TEST_IMG".[123].base
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -28,12 +28,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,14 +27,6 @@ echo "QA output created by $seq"
status=1 # failure is the default!
-_cleanup()
-{
- echo "Cleanup"
- _cleanup_test_img
- rm "${TEST_IMG_FILE2}"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
_compare()
{
$QEMU_IMG compare $QEMU_IMG_EXTRA_ARGS "$@" "$TEST_IMG" "${TEST_IMG2}"
@@ -39,4 +39,3 @@ wrote 512/512 bytes at offset 512
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
Content mismatch at offset 512!
1
-Cleanup
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,14 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
- rm -f "$TEST_IMG.old"
- rm -f "$TEST_IMG.new"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,13 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- rm -f "$TEST_IMG.orig"
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -75,13 +75,7 @@ _export_nbd_snapshot1()
_wait_for_nbd
}
-_cleanup()
-{
- _cleanup_nbd
- _cleanup_test_img
- rm -f "$converted_image"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
+trap "_cleanup_nbd; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
@@ -27,13 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
- rm -f "$TEST_IMG.qcow2"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -28,12 +28,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -28,13 +28,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
- rm -f "$TEST_IMG.orig" "$TEST_IMG.raw1" "$TEST_IMG.raw2"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -28,12 +28,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,15 +27,6 @@ echo "QA output created by $seq"
status=1 # failure is the default!
-_cleanup()
-{
- echo "Cleanup"
- _cleanup_test_img
- rm "${TEST_IMG2}"
- rm -f "$TEST_DIR/blkdebug.conf"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
_compare()
{
$QEMU_IMG compare "$@" "$TEST_IMG" "${TEST_IMG2}"
@@ -15,4 +15,3 @@ qemu-img: Error while reading offset 0 of blkdebug:TEST_DIR/blkdebug.conf:TEST_D
qemu-img: Error while reading offset 0 of blkdebug:TEST_DIR/blkdebug.conf:TEST_DIR/t.IMGFMT: Input/output error
Warning: Image size mismatch!
4
-Cleanup
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,13 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- rm -f $TEST_IMG.snap
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,14 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- rm -rf $TEST_DIR/1.raw
- rm -rf $TEST_DIR/2.raw
- rm -rf $TEST_DIR/3.raw
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -28,12 +28,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -37,18 +37,7 @@ snapshot_virt1="snapshot-v1.qcow2"
SNAPSHOTS=10
-_cleanup()
-{
- _cleanup_qemu
- for i in $(seq 1 ${SNAPSHOTS})
- do
- rm -f "${TEST_DIR}/${i}-${snapshot_virt0}"
- rm -f "${TEST_DIR}/${i}-${snapshot_virt1}"
- done
- rm -f "${TEST_IMG}" "${TEST_IMG}.1" "${TEST_IMG}.2" "${TEST_IMG}.base"
-
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
+trap "_cleanup_qemu; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,13 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- rm -f $TEST_IMG.snap
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -31,13 +31,7 @@ status=1 # failure is the default!
MIG_FIFO="${TEST_DIR}/migrate"
-_cleanup()
-{
- rm -f "${MIG_FIFO}"
- _cleanup_qemu
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
+trap "_cleanup_qemu; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
@@ -27,13 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- rm -f $TEST_IMG.snap
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,14 +27,7 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_qemu
- _cleanup_test_img
- rm -f "$TEST_DIR/source.$IMGFMT"
-}
-
-trap "_cleanup; exit \$status" 0 1 2 3 15
+trap "_cleanup_qemu; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
@@ -30,13 +30,7 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_qemu
- rm -f "${TEST_IMG}.base" "${TEST_IMG}.snp1"
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
+trap "_cleanup_qemu; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
@@ -28,13 +28,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
- _rm_test_img "$TEST_IMG.itmd"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,13 +27,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
- rm -f "$TEST_DIR/blkdebug.conf"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -28,12 +28,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,7 @@ echo "QA output created by $seq"
here=$PWD
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_qemu
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
+trap "_cleanup_qemu; exit \$status" 0 1 2 3 15
# get standard environment, filters and qemu instance handling
. ./common.rc
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=$PWD
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,8 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-trap "exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=$PWD
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment and filters
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -28,12 +28,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,13 +27,7 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_qemu
- rm -f $TEST_IMG.src
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
+trap "_cleanup_qemu; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -28,12 +28,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -28,12 +28,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -30,12 +30,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,7 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_qemu
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
+trap "_cleanup_qemu; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
@@ -28,12 +28,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -28,12 +28,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,13 +27,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- rm -f "$TEST_IMG".[123]
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,13 +27,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
- rm -f "$SRC_IMG"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=$PWD
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
get_image_size_on_host()
{
$QEMU_IMG info -f "$IMGFMT" "$TEST_IMG" | grep "disk size" \
@@ -29,12 +29,7 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_qemu
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
+trap "_cleanup_qemu; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -31,13 +31,7 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_qemu
- _cleanup_test_img
- rm -f "$TEST_DIR/nbd"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
+trap "_cleanup_qemu; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
@@ -27,13 +27,7 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_qemu
- _cleanup_test_img
- rm -f "$TEST_DIR"/{b,m,o}.$IMGFMT
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
+trap "_cleanup_qemu; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
@@ -27,13 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
- rm -f $TEST_IMG.snap
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,7 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_qemu
- rm -f "$TEST_DIR/nbd"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
+trap "_cleanup_qemu; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
@@ -32,13 +32,7 @@ status=1 # failure is the default!
TMP_SNAP1=${TEST_DIR}/tmp.qcow2
TMP_SNAP2=${TEST_DIR}/tmp2.qcow2
-_cleanup()
-{
- _cleanup_qemu
- rm -f "${TEST_IMG}" "${TMP_SNAP1}" "${TMP_SNAP2}"
-}
-
-trap "_cleanup; exit \$status" 0 1 2 3 15
+trap "_cleanup_qemu; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
@@ -27,13 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
- true
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,7 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_qemu
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
+trap "_cleanup_qemu; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -28,18 +28,6 @@ here="$PWD"
tmp=/tmp/$$
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
- rm -f "${TEST_IMG}.base"
- rm -f "${TEST_IMG}.convert"
- rm -f "${TEST_IMG}.a"
- rm -f "${TEST_IMG}.b"
- rm -f "${TEST_IMG}.c"
- rm -f "${TEST_IMG}.lnk"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -35,12 +35,7 @@ echo "QA output created by $seq"
here="$PWD"
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
+trap "_cleanup_qemu; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -26,13 +26,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1
-_cleanup()
-{
- _cleanup_test_img
- rm -f "$TEST_IMG.out"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
. ./common.rc
. ./common.filter
. ./common.pattern
@@ -26,13 +26,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1
-_cleanup()
-{
- _cleanup_test_img
- rm -f "$TEST_IMG.out" "$TEST_IMG.out.dd"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
. ./common.rc
. ./common.filter
. ./common.pattern
@@ -28,13 +28,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- rm -f "${TEST_DIR}/qemu-nbd.pid"
- rm -f 42
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -26,13 +26,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1
-_cleanup()
-{
- _cleanup_test_img
- rm -f "$TEST_IMG.out"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
. ./common.rc
. ./common.filter
. ./common.pattern
@@ -28,12 +28,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,14 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
- rm -f "$TEST_IMG.2"
- rm -f "$TEST_IMG.3"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,13 +27,7 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_qemu
- rm -f "${QEMU_TEST_DIR}/image.base" "${QEMU_TEST_DIR}/image.snp1"
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
+trap "_cleanup_qemu; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -31,13 +31,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
- _rm_test_img "$TEST_IMG.itmd"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,13 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
- rm -f "$TEST_IMG.converted"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,13 +27,6 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
- rm -f "$TEST_DIR/blkdebug.conf"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -29,13 +29,7 @@ status=1 # failure is the default!
MIG_SOCKET="${TEST_DIR}/migrate"
-_cleanup()
-{
- rm -f "${MIG_SOCKET}"
- _cleanup_test_img
- _cleanup_qemu
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
+trap "_cleanup_qemu; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
@@ -28,12 +28,6 @@ here="$PWD"
tmp=/tmp/$$
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -29,14 +29,7 @@ status=1 # failure is the default!
MIG_SOCKET="${TEST_DIR}/migrate"
-_cleanup()
-{
- rm -f "${MIG_SOCKET}"
- rm -f "${TEST_IMG}.dest"
- _cleanup_test_img
- _cleanup_qemu
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
+trap "_cleanup_qemu; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
@@ -29,14 +29,7 @@ status=1 # failure is the default!
MIG_SOCKET="${TEST_DIR}/migrate"
-_cleanup()
-{
- rm -f "${TEST_IMG}.mid"
- rm -f "${TEST_IMG}.copy"
- _cleanup_test_img
- _cleanup_qemu
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
+trap "_cleanup_qemu; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,14 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
- rm -f "$TEST_IMG.2"
- rm -f "$TEST_IMG.3"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,12 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -27,13 +27,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
- rm -f "$TEST_IMG.converted"
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
@@ -28,12 +28,6 @@ echo "QA output created by $seq"
here=`pwd`
status=1 # failure is the default!
-_cleanup()
-{
- _cleanup_test_img
-}
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
# get standard environment, filters and checks
. ./common.rc
. ./common.filter