qemu-iotests: place output in unique dir
v2 cover qemu-iotests: place output in unique dir
Differences v1 -> v2:
Rebase on Kevin's block branch [Suggested-by Eric]
Patch 1:
'check': Added && to the directory change so that the test cannot run if the
directory change fails [Thanks Eric]
Patch 2: [Thanks Eric]
058: Removed the _cleanup(), and just trap _cleanup_nbd() 091: Preserve the _cleanup_qemu()
182: Remove spurious _cleanup_qemu() added in v1 190: New file
git-backport-diff -r kwolf/block.. -u 402fccc
Key:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively
001/3:[0004] [FC] 'qemu-iotests: set TEST_DIR to a unique dir for each test' 002/3:[0022] [FC] 'qemu-iotests: remove file cleanup from bash tests' 003/3:[----] [--] 'qemu-iotests: add option to save temp files on error' Do you want to view the diffs using meld? y/[n]:
This series does 2 things:
1.) Sets TEST_DIR to a unique subdirectory for each test 2.) Has './check' be responsible for removing temporary files 3.) Add option to './check' to retain temporary files in case of error
A caveat is #3 is working currently only for Bash tests, as the Python tests still cleanup up after themselves.
Jeff Cody (3):
qemu-iotests: set TEST_DIR to a unique dir for each test
qemu-iotests: remove file cleanup from bash tests
qemu-iotests: add option to save temp files on error
tests/qemu-iotests/001 | 6 ------ tests/qemu-iotests/002 | 6 ------ tests/qemu-iotests/003 | 6 ------ tests/qemu-iotests/004 | 6 ------ tests/qemu-iotests/005 | 6 ------ tests/qemu-iotests/007 | 7 ------- tests/qemu-iotests/008 | 6 ------ tests/qemu-iotests/009 | 6 ------ tests/qemu-iotests/010 | 6 ------ tests/qemu-iotests/011 | 6 ------ tests/qemu-iotests/012 | 6 ------ tests/qemu-iotests/013 | 6 ------ tests/qemu-iotests/014 | 6 ------ tests/qemu-iotests/015 | 7 ------- tests/qemu-iotests/017 | 6 ------ tests/qemu-iotests/018 | 6 ------ tests/qemu-iotests/019 | 8 -------- tests/qemu-iotests/020 | 8 -------- tests/qemu-iotests/021 | 6 ------ tests/qemu-iotests/022 | 6 ------ tests/qemu-iotests/023 | 6 ------ tests/qemu-iotests/024 | 8 -------- tests/qemu-iotests/025 | 6 ------ tests/qemu-iotests/026 | 7 ------- tests/qemu-iotests/027 | 6 ------ tests/qemu-iotests/028 | 8 -------- tests/qemu-iotests/029 | 7 ------- tests/qemu-iotests/031 | 6 ------ tests/qemu-iotests/032 | 6 ------ tests/qemu-iotests/033 | 6 ------ tests/qemu-iotests/034 | 6 ------ tests/qemu-iotests/035 | 6 ------ tests/qemu-iotests/036 | 6 ------ tests/qemu-iotests/037 | 6 ------ tests/qemu-iotests/038 | 6 ------ tests/qemu-iotests/039 | 6 ------ tests/qemu-iotests/042 | 6 ------ tests/qemu-iotests/043 | 7 ------- tests/qemu-iotests/046 | 6 ------ tests/qemu-iotests/047 | 6 ------ tests/qemu-iotests/048 | 8 -------- tests/qemu-iotests/048.out | 1 - tests/qemu-iotests/049 | 6 ------ tests/qemu-iotests/050 | 8 -------- tests/qemu-iotests/051 | 6 ------ tests/qemu-iotests/052 | 6 ------ tests/qemu-iotests/053 | 7 ------- tests/qemu-iotests/054 | 6 ------ tests/qemu-iotests/058 | 8 +------- tests/qemu-iotests/059 | 7 ------- tests/qemu-iotests/060 | 6 ------ tests/qemu-iotests/061 | 6 ------ tests/qemu-iotests/062 | 6 ------ tests/qemu-iotests/063 | 7 ------- tests/qemu-iotests/064 | 6 ------ tests/qemu-iotests/066 | 6 ------ tests/qemu-iotests/068 | 6 ------ tests/qemu-iotests/069 | 6 ------ tests/qemu-iotests/070 | 6 ------ tests/qemu-iotests/071 | 6 ------ tests/qemu-iotests/072 | 6 ------ tests/qemu-iotests/073 | 6 ------ tests/qemu-iotests/074 | 9 --------- tests/qemu-iotests/074.out | 1 - tests/qemu-iotests/075 | 6 ------ tests/qemu-iotests/076 | 6 ------ tests/qemu-iotests/077 | 6 ------ tests/qemu-iotests/078 | 6 ------ tests/qemu-iotests/079 | 6 ------ tests/qemu-iotests/080 | 7 ------- tests/qemu-iotests/081 | 8 -------- tests/qemu-iotests/082 | 6 ------ tests/qemu-iotests/084 | 6 ------ tests/qemu-iotests/085 | 13 +------------ tests/qemu-iotests/086 | 6 ------ tests/qemu-iotests/088 | 7 ------- tests/qemu-iotests/089 | 6 ------ tests/qemu-iotests/090 | 6 ------ tests/qemu-iotests/091 | 8 +------- tests/qemu-iotests/092 | 7 ------- tests/qemu-iotests/094 | 9 +-------- tests/qemu-iotests/095 | 8 +------- tests/qemu-iotests/097 | 7 ------- tests/qemu-iotests/098 | 7 ------- tests/qemu-iotests/099 | 6 ------ tests/qemu-iotests/101 | 6 ------ tests/qemu-iotests/102 | 7 +------ tests/qemu-iotests/103 | 6 ------ tests/qemu-iotests/104 | 2 -- tests/qemu-iotests/105 | 6 ------ tests/qemu-iotests/106 | 6 ------ tests/qemu-iotests/107 | 6 ------ tests/qemu-iotests/108 | 6 ------ tests/qemu-iotests/109 | 8 +------- tests/qemu-iotests/110 | 6 ------ tests/qemu-iotests/111 | 6 ------ tests/qemu-iotests/112 | 6 ------ tests/qemu-iotests/113 | 6 ------ tests/qemu-iotests/114 | 6 ------ tests/qemu-iotests/115 | 6 ------ tests/qemu-iotests/116 | 6 ------ tests/qemu-iotests/117 | 7 +------ tests/qemu-iotests/119 | 6 ------ tests/qemu-iotests/120 | 6 ------ tests/qemu-iotests/121 | 6 ------ tests/qemu-iotests/122 | 7 ------- tests/qemu-iotests/123 | 7 ------- tests/qemu-iotests/125 | 6 ------ tests/qemu-iotests/130 | 7 +------ tests/qemu-iotests/131 | 6 ------ tests/qemu-iotests/133 | 6 ------ tests/qemu-iotests/134 | 6 ------ tests/qemu-iotests/135 | 6 ------ tests/qemu-iotests/137 | 6 ------ tests/qemu-iotests/138 | 6 ------ tests/qemu-iotests/140 | 8 +------- tests/qemu-iotests/141 | 8 +------- tests/qemu-iotests/142 | 7 ------- tests/qemu-iotests/143 | 7 +------ tests/qemu-iotests/144 | 8 +------- tests/qemu-iotests/145 | 7 ------- tests/qemu-iotests/146 | 7 +------ tests/qemu-iotests/150 | 6 ------ tests/qemu-iotests/153 | 12 ------------ tests/qemu-iotests/154 | 6 ------ tests/qemu-iotests/156 | 7 +------ tests/qemu-iotests/157 | 6 ------ tests/qemu-iotests/158 | 6 ------ tests/qemu-iotests/159 | 7 ------- tests/qemu-iotests/160 | 7 ------- tests/qemu-iotests/162 | 7 ------- tests/qemu-iotests/170 | 7 ------- tests/qemu-iotests/171 | 6 ------ tests/qemu-iotests/172 | 8 -------- tests/qemu-iotests/173 | 8 +------- tests/qemu-iotests/174 | 6 ------ tests/qemu-iotests/175 | 6 ------ tests/qemu-iotests/176 | 7 ------- tests/qemu-iotests/177 | 6 ------ tests/qemu-iotests/178 | 7 ------- tests/qemu-iotests/179 | 7 ------- tests/qemu-iotests/181 | 8 +------- tests/qemu-iotests/182 | 6 ------ tests/qemu-iotests/183 | 9 +-------- tests/qemu-iotests/185 | 9 +-------- tests/qemu-iotests/186 | 6 ------ tests/qemu-iotests/188 | 6 ------ tests/qemu-iotests/189 | 6 ------ tests/qemu-iotests/190 | 7 ------- tests/qemu-iotests/check | 24 ++++++++++++++++++++---- tests/qemu-iotests/common | 6 ++++++ 151 files changed, 45 insertions(+), 955 deletions(-)
Signature · 1 line
2.9.4
PATCH v2 1/3 qemu-iotests: set TEST_DIR to a unique dir for each test
Right now, all qemu-iotests output data into the same scratch directory, and so each tests needs to be responsible for cleanup up its own files.
Have each test use 'scratch/$seq' as its temp directory, so the check script can do simple cleanup of removing the whole temporary directory.
Reviewed-by Eric Blake <[email protected]>
Signed-off-by Jeff Cody <[email protected]>
--- tests/qemu-iotests/check | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
tests/qemu-iotests/check +17 -4
@@ -254,6 +254,7 @@ seq="check" for seq in $list do + TEST_DIR_SEQ=$TEST_DIR/$seq err=false printf %s "$seq" if [ -n "$TESTS_REMAINING_LOG" ] ; then
@@ -300,13 +301,23 @@ do fi export OUTPUT_DIR=$PWD if $debug; then - (cd "$source_iotests"; + ( + export TEST_DIR=$TEST_DIR_SEQ + . "$source_iotests/common.config" + . "$source_iotests/common.rc" + cd "$source_iotests" && MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(($RANDOM % 255 + 1))} \ - $run_command -d 2>&1 | tee $tmp.out) + $run_command -d 2>&1 | tee $tmp.out + ) else - (cd "$source_iotests"; + ( + export TEST_DIR=$TEST_DIR_SEQ + . "$source_iotests/common.config" + . "$source_iotests/common.rc" + cd "$source_iotests" && MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(($RANDOM % 255 + 1))} \ - $run_command >$tmp.out 2>&1) + $run_command >$tmp.out 2>&1 + ) fi sts=$? $timestamp && _timestamp
@@ -370,6 +381,8 @@ do fi fi + rm -rf "$TEST_DIR_SEQ" + fi # come here for each test, except when $showme is true
Signature · 1 line
2.9.4
Re: [Qemu-devel] [PATCH v2 for-2.11 1/3] qemu-iotests: set TEST_DIR to a unique dir for each test
Quoted 2 lines · Jeff Cody
Right now, all qemu-iotests output data into the same scratch directory, and so each tests needs to be responsible for cleanup up its own files.
s/cleanup up/cleaning up/
Quoted 9 lines
Have each test use 'scratch/$seq' as its temp directory, so the check script can do simple cleanup of removing the whole temporary directory.
Reviewed-by Eric Blake <[email protected]>Signed-off-by Jeff Cody <[email protected]>--- tests/qemu-iotests/check | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
R-b stands (thanks for adding the && fix from v1).
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [Qemu-devel] [PATCH v2 for-2.11 1/3] qemu-iotests: set TEST_DIR to a unique dir for each test
Quoted 6 lines · Eric Blake
Quoted 2 lines · Jeff Cody
Right now, all qemu-iotests output data into the same scratch directory, and so each tests needs to be responsible for cleanup up its own files.
s/cleanup up/cleaning up/
Thanks - I'll send a v3 with that change after a while, in case there are more comments. Or if someone applies it to their branch, they can just fix up the commit message if they want.
(Hmm... I guess also s/each tests/each test as well, to be grammatically correct)
Quoted 17 lines
Quoted 9 lines
Have each test use 'scratch/$seq' as its temp directory, so the check script can do simple cleanup of removing the whole temporary directory.
Reviewed-by Eric Blake <[email protected]>Signed-off-by Jeff Cody <[email protected]>--- tests/qemu-iotests/check | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)R-b stands (thanks for adding the && fix from v1).
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
PATCH v2 2/3 qemu-iotests: remove file cleanup from bash tests
In reply to Jeff CodyAll files for a given test are now self-contained in a subdirectory, and therefore the "./check" script can do all file-related cleanup without any help.
This removes file cleanups from the bash tests. The only cleanup left is whatever is needed to kill any spawned processes; e.g. _cleanup_qemu.
Signed-off-by Jeff Cody <[email protected]>
--- tests/qemu-iotests/001 | 6 ------ tests/qemu-iotests/002 | 6 ------ tests/qemu-iotests/003 | 6 ------ tests/qemu-iotests/004 | 6 ------ tests/qemu-iotests/005 | 6 ------ tests/qemu-iotests/007 | 7 ------- tests/qemu-iotests/008 | 6 ------ tests/qemu-iotests/009 | 6 ------ tests/qemu-iotests/010 | 6 ------ tests/qemu-iotests/011 | 6 ------ tests/qemu-iotests/012 | 6 ------ tests/qemu-iotests/013 | 6 ------ tests/qemu-iotests/014 | 6 ------ tests/qemu-iotests/015 | 7 ------- tests/qemu-iotests/017 | 6 ------ tests/qemu-iotests/018 | 6 ------ tests/qemu-iotests/019 | 8 -------- tests/qemu-iotests/020 | 8 -------- tests/qemu-iotests/021 | 6 ------ tests/qemu-iotests/022 | 6 ------ tests/qemu-iotests/023 | 6 ------ tests/qemu-iotests/024 | 8 -------- tests/qemu-iotests/025 | 6 ------ tests/qemu-iotests/026 | 7 ------- tests/qemu-iotests/027 | 6 ------ tests/qemu-iotests/028 | 8 -------- tests/qemu-iotests/029 | 7 ------- tests/qemu-iotests/031 | 6 ------ tests/qemu-iotests/032 | 6 ------ tests/qemu-iotests/033 | 6 ------ tests/qemu-iotests/034 | 6 ------ tests/qemu-iotests/035 | 6 ------ tests/qemu-iotests/036 | 6 ------ tests/qemu-iotests/037 | 6 ------ tests/qemu-iotests/038 | 6 ------ tests/qemu-iotests/039 | 6 ------ tests/qemu-iotests/042 | 6 ------ tests/qemu-iotests/043 | 7 ------- tests/qemu-iotests/046 | 6 ------ tests/qemu-iotests/047 | 6 ------ tests/qemu-iotests/048 | 8 -------- tests/qemu-iotests/048.out | 1 - tests/qemu-iotests/049 | 6 ------ tests/qemu-iotests/050 | 8 -------- tests/qemu-iotests/051 | 6 ------ tests/qemu-iotests/052 | 6 ------ tests/qemu-iotests/053 | 7 ------- tests/qemu-iotests/054 | 6 ------ tests/qemu-iotests/058 | 8 +------- tests/qemu-iotests/059 | 7 ------- tests/qemu-iotests/060 | 6 ------ tests/qemu-iotests/061 | 6 ------ tests/qemu-iotests/062 | 6 ------ tests/qemu-iotests/063 | 7 ------- tests/qemu-iotests/064 | 6 ------ tests/qemu-iotests/066 | 6 ------ tests/qemu-iotests/068 | 6 ------ tests/qemu-iotests/069 | 6 ------ tests/qemu-iotests/070 | 6 ------ tests/qemu-iotests/071 | 6 ------ tests/qemu-iotests/072 | 6 ------ tests/qemu-iotests/073 | 6 ------ tests/qemu-iotests/074 | 9 --------- tests/qemu-iotests/074.out | 1 - tests/qemu-iotests/075 | 6 ------ tests/qemu-iotests/076 | 6 ------ tests/qemu-iotests/077 | 6 ------ tests/qemu-iotests/078 | 6 ------ tests/qemu-iotests/079 | 6 ------ tests/qemu-iotests/080 | 7 ------- tests/qemu-iotests/081 | 8 -------- tests/qemu-iotests/082 | 6 ------ tests/qemu-iotests/084 | 6 ------ tests/qemu-iotests/085 | 13 +------------ tests/qemu-iotests/086 | 6 ------ tests/qemu-iotests/088 | 7 ------- tests/qemu-iotests/089 | 6 ------ tests/qemu-iotests/090 | 6 ------ tests/qemu-iotests/091 | 8 +------- tests/qemu-iotests/092 | 7 ------- tests/qemu-iotests/094 | 9 +-------- tests/qemu-iotests/095 | 8 +------- tests/qemu-iotests/097 | 7 ------- tests/qemu-iotests/098 | 7 ------- tests/qemu-iotests/099 | 6 ------ tests/qemu-iotests/101 | 6 ------ tests/qemu-iotests/102 | 7 +------ tests/qemu-iotests/103 | 6 ------ tests/qemu-iotests/104 | 2 -- tests/qemu-iotests/105 | 6 ------ tests/qemu-iotests/106 | 6 ------ tests/qemu-iotests/107 | 6 ------ tests/qemu-iotests/108 | 6 ------ tests/qemu-iotests/109 | 8 +------- tests/qemu-iotests/110 | 6 ------ tests/qemu-iotests/111 | 6 ------ tests/qemu-iotests/112 | 6 ------ tests/qemu-iotests/113 | 6 ------ tests/qemu-iotests/114 | 6 ------ tests/qemu-iotests/115 | 6 ------ tests/qemu-iotests/116 | 6 ------ tests/qemu-iotests/117 | 7 +------ tests/qemu-iotests/119 | 6 ------ tests/qemu-iotests/120 | 6 ------ tests/qemu-iotests/121 | 6 ------ tests/qemu-iotests/122 | 7 ------- tests/qemu-iotests/123 | 7 ------- tests/qemu-iotests/125 | 6 ------ tests/qemu-iotests/130 | 7 +------ tests/qemu-iotests/131 | 6 ------ tests/qemu-iotests/133 | 6 ------ tests/qemu-iotests/134 | 6 ------ tests/qemu-iotests/135 | 6 ------ tests/qemu-iotests/137 | 6 ------ tests/qemu-iotests/138 | 6 ------ tests/qemu-iotests/140 | 8 +------- tests/qemu-iotests/141 | 8 +------- tests/qemu-iotests/142 | 7 ------- tests/qemu-iotests/143 | 7 +------ tests/qemu-iotests/144 | 8 +------- tests/qemu-iotests/145 | 7 ------- tests/qemu-iotests/146 | 7 +------ tests/qemu-iotests/150 | 6 ------ tests/qemu-iotests/153 | 12 ------------ tests/qemu-iotests/154 | 6 ------ tests/qemu-iotests/156 | 7 +------ tests/qemu-iotests/157 | 6 ------ tests/qemu-iotests/158 | 6 ------ tests/qemu-iotests/159 | 7 ------- tests/qemu-iotests/160 | 7 ------- tests/qemu-iotests/162 | 7 ------- tests/qemu-iotests/170 | 7 ------- tests/qemu-iotests/171 | 6 ------ tests/qemu-iotests/172 | 8 -------- tests/qemu-iotests/173 | 8 +------- tests/qemu-iotests/174 | 6 ------ tests/qemu-iotests/175 | 6 ------ tests/qemu-iotests/176 | 7 ------- tests/qemu-iotests/177 | 6 ------ tests/qemu-iotests/178 | 7 ------- tests/qemu-iotests/179 | 7 ------- tests/qemu-iotests/181 | 8 +------- tests/qemu-iotests/182 | 6 ------ tests/qemu-iotests/183 | 9 +-------- tests/qemu-iotests/185 | 9 +-------- tests/qemu-iotests/186 | 6 ------ tests/qemu-iotests/188 | 6 ------ tests/qemu-iotests/189 | 6 ------ tests/qemu-iotests/190 | 7 ------- 149 files changed, 19 insertions(+), 951 deletions(-)
tests/qemu-iotests/001 +0 -6
@@ -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
tests/qemu-iotests/002 +0 -6
@@ -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
tests/qemu-iotests/003 +0 -6
@@ -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
tests/qemu-iotests/004 +0 -6
@@ -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
tests/qemu-iotests/005 +0 -6
@@ -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
tests/qemu-iotests/007 +0 -7
@@ -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
tests/qemu-iotests/008 +0 -6
@@ -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
tests/qemu-iotests/009 +0 -6
@@ -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
tests/qemu-iotests/010 +0 -6
@@ -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
tests/qemu-iotests/011 +0 -6
@@ -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
tests/qemu-iotests/012 +0 -6
@@ -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
tests/qemu-iotests/013 +0 -6
@@ -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
tests/qemu-iotests/014 +0 -6
@@ -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
tests/qemu-iotests/015 +0 -7
@@ -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
tests/qemu-iotests/017 +0 -6
@@ -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
tests/qemu-iotests/018 +0 -6
@@ -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
tests/qemu-iotests/019 +0 -8
@@ -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
tests/qemu-iotests/020 +0 -8
@@ -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
tests/qemu-iotests/021 +0 -6
@@ -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
tests/qemu-iotests/022 +0 -6
@@ -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
tests/qemu-iotests/023 +0 -6
@@ -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
tests/qemu-iotests/024 +0 -8
@@ -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
tests/qemu-iotests/025 +0 -6
@@ -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
tests/qemu-iotests/026 +0 -7
@@ -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
tests/qemu-iotests/027 +0 -6
@@ -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
tests/qemu-iotests/028 +0 -8
@@ -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
tests/qemu-iotests/029 +0 -7
@@ -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
tests/qemu-iotests/031 +0 -6
@@ -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
tests/qemu-iotests/032 +0 -6
@@ -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
tests/qemu-iotests/033 +0 -6
@@ -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
tests/qemu-iotests/034 +0 -6
@@ -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
tests/qemu-iotests/035 +0 -6
@@ -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
tests/qemu-iotests/036 +0 -6
@@ -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
tests/qemu-iotests/037 +0 -6
@@ -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
tests/qemu-iotests/038 +0 -6
@@ -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
tests/qemu-iotests/039 +0 -6
@@ -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
tests/qemu-iotests/042 +0 -6
@@ -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
tests/qemu-iotests/043 +0 -7
@@ -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
tests/qemu-iotests/046 +0 -6
@@ -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
tests/qemu-iotests/047 +0 -6
@@ -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
tests/qemu-iotests/048 +0 -8
@@ -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}"
tests/qemu-iotests/048.out +0 -1
@@ -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
tests/qemu-iotests/049 +0 -6
@@ -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
tests/qemu-iotests/050 +0 -8
@@ -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
tests/qemu-iotests/051 +0 -6
@@ -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
tests/qemu-iotests/052 +0 -6
@@ -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
tests/qemu-iotests/053 +0 -7
@@ -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
tests/qemu-iotests/054 +0 -6
@@ -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
tests/qemu-iotests/058 +1 -7
@@ -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
tests/qemu-iotests/059 +0 -7
@@ -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
tests/qemu-iotests/060 +0 -6
@@ -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
tests/qemu-iotests/061 +0 -6
@@ -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
tests/qemu-iotests/062 +0 -6
@@ -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
tests/qemu-iotests/063 +0 -7
@@ -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
tests/qemu-iotests/064 +0 -6
@@ -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
tests/qemu-iotests/066 +0 -6
@@ -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
tests/qemu-iotests/068 +0 -6
@@ -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
tests/qemu-iotests/069 +0 -6
@@ -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
tests/qemu-iotests/070 +0 -6
@@ -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
tests/qemu-iotests/071 +0 -6
@@ -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
tests/qemu-iotests/072 +0 -6
@@ -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
tests/qemu-iotests/073 +0 -6
@@ -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
tests/qemu-iotests/074 +0 -9
@@ -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}"
tests/qemu-iotests/074.out +0 -1
@@ -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
tests/qemu-iotests/075 +0 -6
@@ -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
tests/qemu-iotests/076 +0 -6
@@ -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
tests/qemu-iotests/077 +0 -6
@@ -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
tests/qemu-iotests/078 +0 -6
@@ -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
tests/qemu-iotests/079 +0 -6
@@ -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
tests/qemu-iotests/080 +0 -7
@@ -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
tests/qemu-iotests/081 +0 -8
@@ -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
tests/qemu-iotests/082 +0 -6
@@ -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
tests/qemu-iotests/084 +0 -6
@@ -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
tests/qemu-iotests/085 +1 -12
@@ -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
tests/qemu-iotests/086 +0 -6
@@ -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
tests/qemu-iotests/088 +0 -7
@@ -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
tests/qemu-iotests/089 +0 -6
@@ -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
tests/qemu-iotests/090 +0 -6
@@ -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
tests/qemu-iotests/091 +1 -7
@@ -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
tests/qemu-iotests/092 +0 -7
@@ -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
tests/qemu-iotests/094 +1 -8
@@ -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
tests/qemu-iotests/095 +1 -7
@@ -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
tests/qemu-iotests/097 +0 -7
@@ -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
tests/qemu-iotests/098 +0 -7
@@ -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
tests/qemu-iotests/099 +0 -6
@@ -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
tests/qemu-iotests/101 +0 -6
@@ -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
tests/qemu-iotests/102 +1 -6
@@ -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
tests/qemu-iotests/103 +0 -6
@@ -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
tests/qemu-iotests/104 +0 -2
@@ -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
tests/qemu-iotests/105 +0 -6
@@ -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
tests/qemu-iotests/106 +0 -6
@@ -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
tests/qemu-iotests/107 +0 -6
@@ -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
tests/qemu-iotests/108 +0 -6
@@ -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
tests/qemu-iotests/109 +1 -7
@@ -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
tests/qemu-iotests/110 +0 -6
@@ -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
tests/qemu-iotests/111 +0 -6
@@ -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
tests/qemu-iotests/112 +0 -6
@@ -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
tests/qemu-iotests/113 +0 -6
@@ -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
tests/qemu-iotests/114 +0 -6
@@ -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
tests/qemu-iotests/115 +0 -6
@@ -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
tests/qemu-iotests/116 +0 -6
@@ -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
tests/qemu-iotests/117 +1 -6
@@ -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
tests/qemu-iotests/119 +0 -6
@@ -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
tests/qemu-iotests/120 +0 -6
@@ -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
tests/qemu-iotests/121 +0 -6
@@ -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
tests/qemu-iotests/122 +0 -7
@@ -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
tests/qemu-iotests/123 +0 -7
@@ -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
tests/qemu-iotests/125 +0 -6
@@ -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" \
tests/qemu-iotests/130 +1 -6
@@ -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
tests/qemu-iotests/131 +0 -6
@@ -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
tests/qemu-iotests/133 +0 -6
@@ -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
tests/qemu-iotests/134 +0 -6
@@ -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
tests/qemu-iotests/135 +0 -6
@@ -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
tests/qemu-iotests/137 +0 -6
@@ -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
tests/qemu-iotests/138 +0 -6
@@ -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
tests/qemu-iotests/140 +1 -7
@@ -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
tests/qemu-iotests/141 +1 -7
@@ -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
tests/qemu-iotests/142 +0 -7
@@ -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
tests/qemu-iotests/143 +1 -6
@@ -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
tests/qemu-iotests/144 +1 -7
@@ -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
tests/qemu-iotests/145 +0 -7
@@ -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
tests/qemu-iotests/146 +1 -6
@@ -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
tests/qemu-iotests/150 +0 -6
@@ -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
tests/qemu-iotests/153 +0 -12
@@ -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
tests/qemu-iotests/154 +0 -6
@@ -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
tests/qemu-iotests/156 +1 -6
@@ -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
tests/qemu-iotests/157 +0 -6
@@ -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
tests/qemu-iotests/158 +0 -6
@@ -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
tests/qemu-iotests/159 +0 -7
@@ -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
tests/qemu-iotests/160 +0 -7
@@ -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
tests/qemu-iotests/162 +0 -7
@@ -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
tests/qemu-iotests/170 +0 -7
@@ -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
tests/qemu-iotests/171 +0 -6
@@ -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
tests/qemu-iotests/172 +0 -8
@@ -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
tests/qemu-iotests/173 +1 -7
@@ -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
tests/qemu-iotests/174 +0 -6
@@ -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
tests/qemu-iotests/175 +0 -6
@@ -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
tests/qemu-iotests/176 +0 -7
@@ -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
tests/qemu-iotests/177 +0 -6
@@ -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
tests/qemu-iotests/178 +0 -7
@@ -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
tests/qemu-iotests/179 +0 -7
@@ -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
tests/qemu-iotests/181 +1 -7
@@ -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
tests/qemu-iotests/182 +0 -6
@@ -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
tests/qemu-iotests/183 +1 -8
@@ -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
tests/qemu-iotests/185 +1 -8
@@ -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
tests/qemu-iotests/186 +0 -6
@@ -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
tests/qemu-iotests/188 +0 -6
@@ -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
tests/qemu-iotests/189 +0 -6
@@ -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
tests/qemu-iotests/190 +0 -7
@@ -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
Signature · 1 line
2.9.4
Re: [Qemu-devel] [PATCH v2 for-2.11 2/3] qemu-iotests: remove file cleanup from bash tests
Quoted 9 lines · Jeff Cody
All files for a given test are now self-contained in a subdirectory, and therefore the "./check" script can do all file-related cleanup without any help.
This removes file cleanups from the bash tests. The only cleanup left is whatever is needed to kill any spawned processes; e.g.
_cleanup_qemu.Signed-off-by Jeff Cody <[email protected]>---
Based on cover letter description of diff from v1, you addressed my concerns.
Reviewed-by Eric Blake <[email protected]>
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
PATCH v2 3/3 qemu-iotests: add option to save temp files on error
In reply to Jeff CodyNow that ./check takes care of cleaning up after each tests, it can also selectively not clean up. Add option to leave all output from tests intact if that test encountered an error.
Note: this currently only works for bash tests, as the python tests still clean up after themselves manually.
Reviewed-by Eric Blake <[email protected]>
Signed-off-by Jeff Cody <[email protected]>
--- tests/qemu-iotests/check | 5 ++++- tests/qemu-iotests/common | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-)
tests/qemu-iotests/check +4 -1
@@ -381,7 +381,10 @@ do fi fi - rm -rf "$TEST_DIR_SEQ" + if [ "$save_on_err" != "true" ] || [ "$err" != "true" ] + then + rm -rf "$TEST_DIR_SEQ" + fi fi
tests/qemu-iotests/common +6 -0
@@ -42,6 +42,7 @@ expunge=true have_test_arg=false randomize=false cachemode=false +save_on_err=false rm -f $tmp.list $tmp.tmp $tmp.sed export IMGFMT=raw
@@ -172,6 +173,7 @@ other options -T output timestamps -r randomize test order -c mode cache mode + -s save test scratch directory on test failure testlist options -g group[,group...] include tests from these groups
@@ -349,6 +351,10 @@ testlist options xgroup=true xpand=false ;; + -s) + save_on_err=true + xpand=false + ;; '[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]') echo "No tests?" status=1
Signature · 1 line
2.9.4
Re: [Qemu-devel] [PATCH v2 for-2.11 3/3] qemu-iotests: add option to save temp files on error
Quoted 6 lines · Jeff Cody
Now that ./check takes care of cleaning up after each tests, it can also selectively not clean up. Add option to leave all output from tests intact if that test encountered an error.
Note: this currently only works for bash tests, as the python tests still clean up after themselves manually.
Should we add a TODO comment for that?
Much appreciated work, by the way. You might want to mention in one of your commit messages that this is also a step towards running iotests in parallel.
Another step towards sanity would be making $TEST_DIR instead of $source_iotests the current working directory for running tests.
Re: [Qemu-devel] [PATCH v2 for-2.11 3/3] qemu-iotests: add option to save temp files on error
Quoted 11 lines · Markus Armbruster
Quoted 6 lines · Jeff Cody
Now that ./check takes care of cleaning up after each tests, it can also selectively not clean up. Add option to leave all output from tests intact if that test encountered an error.
Note: this currently only works for bash tests, as the python tests still clean up after themselves manually.
Should we add a TODO comment for that?
Couldn't hurt!
Quoted 4 lines
Much appreciated work, by the way. You might want to mention in one of your commit messages that this is also a step towards running iotests in parallel.
Thanks. I'll go ahead and spin a v3 to clean up commit messages and add a TODO, since 2.11 won't open for a while.
Quoted 2 lines
Another step towards sanity would be making $TEST_DIR instead of $source_iotests the current working directory for running tests.
Yep!