jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

iotests: Use _rm_test_img for deleting test images

Just rm will not delete external data files. Use _rm_test_img every
time we delete a test image.

(In the process, clean up the indentation of every _cleanup() this patch
touches.)

((Also, use quotes consistently. I am happy to see unquoted instances
like "rm -rf $TEST_DIR/..." go.))

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-id: 20191107163708.833192-16-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>

Max Reitz f91ecbd7 52a97b5a

+118 -95
+3 -3
tests/qemu-iotests/019
··· 30 30 31 31 _cleanup() 32 32 { 33 - _cleanup_test_img 34 - rm -f "$TEST_IMG.base" 35 - rm -f "$TEST_IMG.orig" 33 + _cleanup_test_img 34 + _rm_test_img "$TEST_IMG.base" 35 + _rm_test_img "$TEST_IMG.orig" 36 36 } 37 37 trap "_cleanup; exit \$status" 0 1 2 3 15 38 38
+3 -3
tests/qemu-iotests/020
··· 28 28 29 29 _cleanup() 30 30 { 31 - _cleanup_test_img 32 - rm -f "$TEST_IMG.base" 33 - rm -f "$TEST_IMG.orig" 31 + _cleanup_test_img 32 + _rm_test_img "$TEST_IMG.base" 33 + _rm_test_img "$TEST_IMG.orig" 34 34 } 35 35 trap "_cleanup; exit \$status" 0 1 2 3 15 36 36
+5 -5
tests/qemu-iotests/024
··· 29 29 _cleanup() 30 30 { 31 31 _cleanup_test_img 32 - rm -f "$TEST_DIR/t.$IMGFMT.base_old" 33 - rm -f "$TEST_DIR/t.$IMGFMT.base_new" 32 + _rm_test_img "$TEST_DIR/t.$IMGFMT.base_old" 33 + _rm_test_img "$TEST_DIR/t.$IMGFMT.base_new" 34 34 35 - rm -f "$TEST_DIR/subdir/t.$IMGFMT" 36 - rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_old" 37 - rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_new" 35 + _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT" 36 + _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT.base_old" 37 + _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT.base_new" 38 38 rmdir "$TEST_DIR/subdir" 2> /dev/null 39 39 } 40 40 trap "_cleanup; exit \$status" 0 1 2 3 15
+1 -1
tests/qemu-iotests/028
··· 32 32 _cleanup() 33 33 { 34 34 _cleanup_qemu 35 - rm -f "${TEST_IMG}.copy" 35 + _rm_test_img "${TEST_IMG}.copy" 36 36 _cleanup_test_img 37 37 } 38 38 trap "_cleanup; exit \$status" 0 1 2 3 15
+1 -1
tests/qemu-iotests/029
··· 28 28 29 29 _cleanup() 30 30 { 31 - rm -f $TEST_IMG.snap 31 + _rm_test_img "$TEST_IMG.snap" 32 32 _cleanup_test_img 33 33 } 34 34 trap "_cleanup; exit \$status" 0 1 2 3 15
+3 -1
tests/qemu-iotests/043
··· 29 29 _cleanup() 30 30 { 31 31 _cleanup_test_img 32 - rm -f "$TEST_IMG".[123].base 32 + for img in "$TEST_IMG".[123].base; do 33 + _rm_test_img "$img" 34 + done 33 35 } 34 36 trap "_cleanup; exit \$status" 0 1 2 3 15 35 37
+1 -1
tests/qemu-iotests/048
··· 31 31 { 32 32 echo "Cleanup" 33 33 _cleanup_test_img 34 - rm "${TEST_IMG_FILE2}" 34 + _rm_test_img "${TEST_IMG_FILE2}" 35 35 } 36 36 trap "_cleanup; exit \$status" 0 1 2 3 15 37 37
+2 -2
tests/qemu-iotests/050
··· 29 29 _cleanup() 30 30 { 31 31 _cleanup_test_img 32 - rm -f "$TEST_IMG.old" 33 - rm -f "$TEST_IMG.new" 32 + _rm_test_img "$TEST_IMG.old" 33 + _rm_test_img "$TEST_IMG.new" 34 34 } 35 35 trap "_cleanup; exit \$status" 0 1 2 3 15 36 36
+2 -2
tests/qemu-iotests/053
··· 28 28 29 29 _cleanup() 30 30 { 31 - rm -f "$TEST_IMG.orig" 32 - _cleanup_test_img 31 + _rm_test_img "$TEST_IMG.orig" 32 + _cleanup_test_img 33 33 } 34 34 trap "_cleanup; exit \$status" 0 1 2 3 15 35 35
+1 -1
tests/qemu-iotests/058
··· 42 42 { 43 43 nbd_server_stop 44 44 _cleanup_test_img 45 - rm -f "$converted_image" 45 + _rm_test_img "$converted_image" 46 46 } 47 47 trap "_cleanup; exit \$status" 0 1 2 3 15 48 48
+1 -1
tests/qemu-iotests/059
··· 29 29 _cleanup() 30 30 { 31 31 _cleanup_test_img 32 - rm -f "$TEST_IMG.qcow2" 32 + IMGFMT=qcow2 _rm_test_img "$TEST_IMG.qcow2" 33 33 } 34 34 trap "_cleanup; exit \$status" 0 1 2 3 15 35 35
+1 -1
tests/qemu-iotests/061
··· 29 29 _cleanup() 30 30 { 31 31 _cleanup_test_img 32 - rm -f $TEST_IMG.data 32 + _rm_test_img "$TEST_IMG.data" 33 33 } 34 34 trap "_cleanup; exit \$status" 0 1 2 3 15 35 35
+4 -2
tests/qemu-iotests/063
··· 29 29 30 30 _cleanup() 31 31 { 32 - _cleanup_test_img 33 - rm -f "$TEST_IMG.orig" "$TEST_IMG.raw1" "$TEST_IMG.raw2" 32 + _cleanup_test_img 33 + for img in "$TEST_IMG".{orig,raw1,raw2,target}; do 34 + _rm_test_img "$img" 35 + done 34 36 } 35 37 trap "_cleanup; exit \$status" 0 1 2 3 15 36 38
+1 -1
tests/qemu-iotests/069
··· 47 47 echo 48 48 TEST_IMG="$TEST_IMG.base" _make_test_img $IMG_SIZE 49 49 _make_test_img -b "$TEST_IMG.base" $IMG_SIZE 50 - rm -f "$TEST_IMG.base" 50 + _rm_test_img "$TEST_IMG.base" 51 51 # Just open the image and close it right again (this should print an error message) 52 52 $QEMU_IO -c quit "$TEST_IMG" 2>&1 | _filter_testdir | _filter_imgfmt 53 53
+1 -1
tests/qemu-iotests/074
··· 31 31 { 32 32 echo "Cleanup" 33 33 _cleanup_test_img 34 - rm "${TEST_IMG2}" 34 + _rm_test_img "${TEST_IMG2}" 35 35 rm -f "$TEST_DIR/blkdebug.conf" 36 36 } 37 37 trap "_cleanup; exit \$status" 0 1 2 3 15
+1 -1
tests/qemu-iotests/080
··· 28 28 29 29 _cleanup() 30 30 { 31 - rm -f $TEST_IMG.snap 31 + _rm_test_img "$TEST_IMG.snap" 32 32 _cleanup_test_img 33 33 } 34 34 trap "_cleanup; exit \$status" 0 1 2 3 15
+3 -3
tests/qemu-iotests/081
··· 28 28 29 29 _cleanup() 30 30 { 31 - rm -rf $TEST_DIR/1.raw 32 - rm -rf $TEST_DIR/2.raw 33 - rm -rf $TEST_DIR/3.raw 31 + _rm_test_img "$TEST_DIR/1.raw" 32 + _rm_test_img "$TEST_DIR/2.raw" 33 + _rm_test_img "$TEST_DIR/3.raw" 34 34 } 35 35 trap "_cleanup; exit \$status" 0 1 2 3 15 36 36
+6 -3
tests/qemu-iotests/085
··· 41 41 _cleanup_qemu 42 42 for i in $(seq 1 ${SNAPSHOTS}) 43 43 do 44 - rm -f "${TEST_DIR}/${i}-${snapshot_virt0}" 45 - rm -f "${TEST_DIR}/${i}-${snapshot_virt1}" 44 + _rm_test_img "${TEST_DIR}/${i}-${snapshot_virt0}" 45 + _rm_test_img "${TEST_DIR}/${i}-${snapshot_virt1}" 46 + done 47 + for img in "${TEST_IMG}".{1,2,base} 48 + do 49 + _rm_test_img "$img" 46 50 done 47 - rm -f "${TEST_IMG}" "${TEST_IMG}.1" "${TEST_IMG}.2" "${TEST_IMG}.base" 48 51 49 52 } 50 53 trap "_cleanup; exit \$status" 0 1 2 3 15
+1 -1
tests/qemu-iotests/088
··· 28 28 29 29 _cleanup() 30 30 { 31 - rm -f $TEST_IMG.snap 31 + _rm_test_img "$TEST_IMG.snap" 32 32 _cleanup_test_img 33 33 } 34 34 trap "_cleanup; exit \$status" 0 1 2 3 15
+1 -1
tests/qemu-iotests/092
··· 28 28 29 29 _cleanup() 30 30 { 31 - rm -f $TEST_IMG.snap 31 + _rm_test_img "$TEST_IMG.snap" 32 32 _cleanup_test_img 33 33 } 34 34 trap "_cleanup; exit \$status" 0 1 2 3 15
+1 -1
tests/qemu-iotests/094
··· 30 30 { 31 31 _cleanup_qemu 32 32 _cleanup_test_img 33 - rm -f "$TEST_DIR/source.$IMGFMT" 33 + _rm_test_img "$TEST_DIR/source.$IMGFMT" 34 34 } 35 35 36 36 trap "_cleanup; exit \$status" 0 1 2 3 15
+3 -2
tests/qemu-iotests/095
··· 32 32 _cleanup() 33 33 { 34 34 _cleanup_qemu 35 - rm -f "${TEST_IMG}.base" "${TEST_IMG}.snp1" 36 - _cleanup_test_img 35 + _rm_test_img "${TEST_IMG}.base" 36 + _rm_test_img "${TEST_IMG}.snp1" 37 + _cleanup_test_img 37 38 } 38 39 trap "_cleanup; exit \$status" 0 1 2 3 15 39 40
+4 -3
tests/qemu-iotests/099
··· 29 29 30 30 _cleanup() 31 31 { 32 - _cleanup_test_img 32 + _cleanup_test_img 33 + _rm_test_img "$TEST_IMG.compare" 34 + rm -f "$TEST_DIR/blkdebug.conf" 35 + 33 36 } 34 37 trap "_cleanup; exit \$status" 0 1 2 3 15 35 38 ··· 120 123 121 124 test_qemu "file.driver=blkdebug,file.image.filename=$TEST_IMG" 122 125 123 - 124 - rm -f "$TEST_IMG.compare" "$TEST_DIR/blkdebug.conf" 125 126 126 127 # success, all done 127 128 echo "*** done"
+2 -2
tests/qemu-iotests/109
··· 29 29 _cleanup() 30 30 { 31 31 _cleanup_qemu 32 - rm -f $TEST_IMG.src 33 - _cleanup_test_img 32 + _rm_test_img "$TEST_IMG.src" 33 + _cleanup_test_img 34 34 } 35 35 trap "_cleanup; exit \$status" 0 1 2 3 15 36 36
+2 -2
tests/qemu-iotests/110
··· 28 28 29 29 _cleanup() 30 30 { 31 - _cleanup_test_img 32 - rm -f "$TEST_IMG.copy" 31 + _cleanup_test_img 32 + _rm_test_img "$TEST_IMG.copy" 33 33 } 34 34 trap "_cleanup; exit \$status" 0 1 2 3 15 35 35
+4 -2
tests/qemu-iotests/122
··· 28 28 29 29 _cleanup() 30 30 { 31 - rm -f "$TEST_IMG".[123] 32 - _cleanup_test_img 31 + for img in "$TEST_IMG".[123]; do 32 + _rm_test_img "$img" 33 + done 34 + _cleanup_test_img 33 35 } 34 36 trap "_cleanup; exit \$status" 0 1 2 3 15 35 37
+1 -1
tests/qemu-iotests/123
··· 29 29 _cleanup() 30 30 { 31 31 _cleanup_test_img 32 - rm -f "$SRC_IMG" 32 + _rm_test_img "$SRC_IMG" 33 33 } 34 34 trap "_cleanup; exit \$status" 0 1 2 3 15 35 35
+3 -1
tests/qemu-iotests/141
··· 30 30 { 31 31 _cleanup_qemu 32 32 _cleanup_test_img 33 - rm -f "$TEST_DIR"/{b,m,o}.$IMGFMT 33 + for img in "$TEST_DIR"/{b,m,o}.$IMGFMT; do 34 + _rm_test_img "$img" 35 + done 34 36 } 35 37 trap "_cleanup; exit \$status" 0 1 2 3 15 36 38
+1 -1
tests/qemu-iotests/142
··· 29 29 _cleanup() 30 30 { 31 31 _cleanup_test_img 32 - rm -f $TEST_IMG.snap 32 + _rm_test_img "$TEST_IMG.snap" 33 33 } 34 34 trap "_cleanup; exit \$status" 0 1 2 3 15 35 35
+3 -1
tests/qemu-iotests/144
··· 34 34 _cleanup() 35 35 { 36 36 _cleanup_qemu 37 - rm -f "${TEST_IMG}" "${TMP_SNAP1}" "${TMP_SNAP2}" 37 + for img in "${TEST_IMG}" "${TMP_SNAP1}" "${TMP_SNAP2}"; do 38 + _rm_test_img "$img" 39 + done 38 40 } 39 41 40 42 trap "_cleanup; exit \$status" 0 1 2 3 15
+3 -7
tests/qemu-iotests/153
··· 30 30 _cleanup() 31 31 { 32 32 _cleanup_test_img 33 - rm -f "${TEST_IMG}.base" 34 - rm -f "${TEST_IMG}.overlay" 35 - rm -f "${TEST_IMG}.convert" 36 - rm -f "${TEST_IMG}.a" 37 - rm -f "${TEST_IMG}.b" 38 - rm -f "${TEST_IMG}.c" 39 - rm -f "${TEST_IMG}.lnk" 33 + for img in "${TEST_IMG}".{base,overlay,convert,a,b,c,lnk}; do 34 + _rm_test_img "$img" 35 + done 40 36 } 41 37 trap "_cleanup; exit \$status" 0 1 2 3 15 42 38
+6 -2
tests/qemu-iotests/156
··· 37 37 _cleanup() 38 38 { 39 39 _cleanup_qemu 40 - rm -f "$TEST_IMG"{,.target}{,.backing,.overlay} 40 + for img in "$TEST_IMG"{,.target}{,.backing,.overlay}; do 41 + _rm_test_img "$img" 42 + done 41 43 } 42 44 trap "_cleanup; exit \$status" 0 1 2 3 15 43 45 ··· 120 122 '"status": "null"' 121 123 122 124 # Remove the source images 123 - rm -f "$TEST_IMG{,.backing,.overlay}" 125 + for img in "$TEST_IMG{,.backing,.overlay}"; do 126 + _rm_test_img "$img" 127 + done 124 128 125 129 echo 126 130
+1 -1
tests/qemu-iotests/159
··· 28 28 _cleanup() 29 29 { 30 30 _cleanup_test_img 31 - rm -f "$TEST_IMG.out" 31 + _rm_test_img "$TEST_IMG.out" 32 32 } 33 33 trap "_cleanup; exit \$status" 0 1 2 3 15 34 34
+2 -1
tests/qemu-iotests/160
··· 28 28 _cleanup() 29 29 { 30 30 _cleanup_test_img 31 - rm -f "$TEST_IMG.out" "$TEST_IMG.out.dd" 31 + _rm_test_img "$TEST_IMG.out" 32 + _rm_test_img "$TEST_IMG.out.dd" 32 33 } 33 34 trap "_cleanup; exit \$status" 0 1 2 3 15 34 35
+2 -2
tests/qemu-iotests/161
··· 30 30 _cleanup() 31 31 { 32 32 _cleanup_test_img 33 - rm -f "$TEST_IMG.base" 34 - rm -f "$TEST_IMG.int" 33 + _rm_test_img "$TEST_IMG.base" 34 + _rm_test_img "$TEST_IMG.int" 35 35 } 36 36 trap "_cleanup; exit \$status" 0 1 2 3 15 37 37
+1 -1
tests/qemu-iotests/170
··· 28 28 _cleanup() 29 29 { 30 30 _cleanup_test_img 31 - rm -f "$TEST_IMG.out" 31 + _rm_test_img "$TEST_IMG.out" 32 32 } 33 33 trap "_cleanup; exit \$status" 0 1 2 3 15 34 34
+3 -3
tests/qemu-iotests/172
··· 28 28 29 29 _cleanup() 30 30 { 31 - _cleanup_test_img 32 - rm -f "$TEST_IMG.2" 33 - rm -f "$TEST_IMG.3" 31 + _cleanup_test_img 32 + _rm_test_img "$TEST_IMG.2" 33 + _rm_test_img "$TEST_IMG.3" 34 34 } 35 35 trap "_cleanup; exit \$status" 0 1 2 3 15 36 36
+2 -1
tests/qemu-iotests/173
··· 29 29 _cleanup() 30 30 { 31 31 _cleanup_qemu 32 - rm -f "${QEMU_TEST_DIR}/image.base" "${QEMU_TEST_DIR}/image.snp1" 32 + _rm_test_img "${TEST_DIR}/image.base" 33 + _rm_test_img "${TEST_DIR}/image.snp1" 33 34 _cleanup_test_img 34 35 } 35 36 trap "_cleanup; exit \$status" 0 1 2 3 15
+1 -1
tests/qemu-iotests/178
··· 29 29 _cleanup() 30 30 { 31 31 _cleanup_test_img 32 - rm -f "$TEST_IMG.converted" 32 + _rm_test_img "$TEST_IMG.converted" 33 33 } 34 34 trap "_cleanup; exit \$status" 0 1 2 3 15 35 35
+1 -1
tests/qemu-iotests/182
··· 30 30 _cleanup() 31 31 { 32 32 _cleanup_test_img 33 - rm -f "$TEST_IMG.overlay" 33 + _rm_test_img "$TEST_IMG.overlay" 34 34 rm -f "$SOCK_DIR/nbd.socket" 35 35 } 36 36 trap "_cleanup; exit \$status" 0 1 2 3 15
+1 -1
tests/qemu-iotests/183
··· 31 31 _cleanup() 32 32 { 33 33 rm -f "${MIG_SOCKET}" 34 - rm -f "${TEST_IMG}.dest" 34 + _rm_test_img "${TEST_IMG}.dest" 35 35 _cleanup_test_img 36 36 _cleanup_qemu 37 37 }
+2 -2
tests/qemu-iotests/185
··· 28 28 29 29 _cleanup() 30 30 { 31 - rm -f "${TEST_IMG}.mid" 32 - rm -f "${TEST_IMG}.copy" 31 + _rm_test_img "${TEST_IMG}.mid" 32 + _rm_test_img "${TEST_IMG}.copy" 33 33 _cleanup_test_img 34 34 _cleanup_qemu 35 35 }
+3 -3
tests/qemu-iotests/187
··· 28 28 29 29 _cleanup() 30 30 { 31 - _cleanup_test_img 32 - rm -f "$TEST_IMG.2" 33 - rm -f "$TEST_IMG.3" 31 + _cleanup_test_img 32 + _rm_test_img "$TEST_IMG.2" 33 + _rm_test_img "$TEST_IMG.3" 34 34 } 35 35 trap "_cleanup; exit \$status" 0 1 2 3 15 36 36
+1 -1
tests/qemu-iotests/190
··· 29 29 _cleanup() 30 30 { 31 31 _cleanup_test_img 32 - rm -f "$TEST_IMG.converted" 32 + _rm_test_img "$TEST_IMG.converted" 33 33 } 34 34 trap "_cleanup; exit \$status" 0 1 2 3 15 35 35
+3 -3
tests/qemu-iotests/191
··· 28 28 29 29 _cleanup() 30 30 { 31 - rm -f "${TEST_IMG}.mid" 32 - rm -f "${TEST_IMG}.ovl2" 33 - rm -f "${TEST_IMG}.ovl3" 31 + _rm_test_img "${TEST_IMG}.mid" 32 + _rm_test_img "${TEST_IMG}.ovl2" 33 + _rm_test_img "${TEST_IMG}.ovl3" 34 34 _cleanup_test_img 35 35 _cleanup_qemu 36 36 }
+1 -1
tests/qemu-iotests/195
··· 29 29 _cleanup() 30 30 { 31 31 _cleanup_test_img 32 - rm -f "$TEST_IMG.mid" 32 + _rm_test_img "$TEST_IMG.mid" 33 33 } 34 34 trap "_cleanup; exit \$status" 0 1 2 3 15 35 35
+1 -1
tests/qemu-iotests/197
··· 43 43 _cleanup() 44 44 { 45 45 _cleanup_test_img 46 - rm -f "$TEST_WRAP" 46 + _rm_test_img "$TEST_WRAP" 47 47 rm -f "$BLKDBG_CONF" 48 48 } 49 49 trap "_cleanup; exit \$status" 0 1 2 3 15
+2 -1
tests/qemu-iotests/200
··· 31 31 _cleanup() 32 32 { 33 33 _cleanup_qemu 34 - rm -f "${TEST_IMG}" "${BACKING_IMG}" 34 + _rm_test_img "${TEST_IMG}" 35 + _rm_test_img "${BACKING_IMG}" 35 36 } 36 37 trap "_cleanup; exit \$status" 0 1 2 3 15 37 38
+1 -1
tests/qemu-iotests/215
··· 40 40 _cleanup() 41 41 { 42 42 _cleanup_test_img 43 - rm -f "$TEST_WRAP" 43 + _rm_test_img "$TEST_WRAP" 44 44 rm -f "$BLKDBG_CONF" 45 45 } 46 46 trap "_cleanup; exit \$status" 0 1 2 3 15
+1 -1
tests/qemu-iotests/225
··· 29 29 _cleanup() 30 30 { 31 31 _cleanup_test_img 32 - rm -f "$TEST_IMG.not_base" 32 + _rm_test_img "$TEST_IMG.not_base" 33 33 } 34 34 trap "_cleanup; exit \$status" 0 1 2 3 15 35 35
+2 -1
tests/qemu-iotests/229
··· 31 31 { 32 32 _cleanup_qemu 33 33 _cleanup_test_img 34 - rm -f "$TEST_IMG" "$DEST_IMG" 34 + _rm_test_img "$TEST_IMG" 35 + _rm_test_img "$DEST_IMG" 35 36 } 36 37 trap "_cleanup; exit \$status" 0 1 2 3 15 37 38
+3 -1
tests/qemu-iotests/232
··· 29 29 _cleanup() 30 30 { 31 31 _cleanup_test_img 32 - rm -f $TEST_IMG.[01234] 32 + for img in "$TEST_IMG".[01234]; do 33 + _rm_test_img "$img" 34 + done 33 35 } 34 36 trap "_cleanup; exit \$status" 0 1 2 3 15 35 37
+1 -1
tests/qemu-iotests/243
··· 29 29 _cleanup() 30 30 { 31 31 _cleanup_test_img 32 - rm -f $TEST_IMG.data 32 + _rm_test_img "$TEST_IMG.data" 33 33 } 34 34 trap "_cleanup; exit \$status" 0 1 2 3 15 35 35
+2 -2
tests/qemu-iotests/244
··· 29 29 _cleanup() 30 30 { 31 31 _cleanup_test_img 32 - rm -f $TEST_IMG.data 33 - rm -f $TEST_IMG.src 32 + _rm_test_img "$TEST_IMG.data" 33 + _rm_test_img "$TEST_IMG.src" 34 34 } 35 35 trap "_cleanup; exit \$status" 0 1 2 3 15 36 36
+3 -1
tests/qemu-iotests/247
··· 29 29 _cleanup() 30 30 { 31 31 _cleanup_test_img 32 - rm -f $TEST_IMG.[01234] 32 + for img in "$TEST_IMG".[01234]; do 33 + _rm_test_img "$img" 34 + done 33 35 } 34 36 trap "_cleanup; exit \$status" 0 1 2 3 15 35 37
+2 -2
tests/qemu-iotests/249
··· 30 30 _cleanup() 31 31 { 32 32 _cleanup_test_img 33 - rm -f "$TEST_IMG.base" 34 - rm -f "$TEST_IMG.int" 33 + _rm_test_img "$TEST_IMG.base" 34 + _rm_test_img "$TEST_IMG.int" 35 35 } 36 36 trap "_cleanup; exit \$status" 0 1 2 3 15 37 37
+1 -1
tests/qemu-iotests/252
··· 29 29 _cleanup() 30 30 { 31 31 _cleanup_test_img 32 - rm -f "$TEST_IMG.base_new" 32 + _rm_test_img "$TEST_IMG.base_new" 33 33 } 34 34 trap "_cleanup; exit \$status" 0 1 2 3 15 35 35