Message ID | 20170927211334.3988-1-mreitz@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 09/27/2017 04:13 PM, Max Reitz wrote: > do_run_qemu() in iotest 195 first applies _filter_imgfmt when printing > qemu's command line and _filter_testdir only afterwards. Therefore, if > the image format is part of the test directory path, _filter_testdir > will no longer apply and the actual output will differ from the > reference output even in case of success. > > For example, TEST_DIR might be "/tmp/test-qcow2", in which case > _filter_imgfmt first transforms this to "/tmp/test-IMGFMT" which is no > longer recognized as the TEST_DIR by _filter_testdir. > > Fix this by not applying _filter_imgfmt in do_run_qemu() but in > run_qemu() instead, and only after _filter_testdir. > > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > tests/qemu-iotests/195 | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) Reviewed-by: Eric Blake <eblake@redhat.com>
diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195 index 05a239cbf5..e7a403ded2 100755 --- a/tests/qemu-iotests/195 +++ b/tests/qemu-iotests/195 @@ -44,15 +44,16 @@ _supported_os Linux function do_run_qemu() { - echo Testing: "$@" | _filter_imgfmt + echo Testing: "$@" $QEMU -nographic -qmp-pretty stdio -serial none "$@" echo } function run_qemu() { - do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_qmp \ - | _filter_qemu_io | _filter_generated_node_ids + do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_imgfmt | _filter_qemu \ + | _filter_qmp | _filter_qemu_io \ + | _filter_generated_node_ids } size=64M
do_run_qemu() in iotest 195 first applies _filter_imgfmt when printing qemu's command line and _filter_testdir only afterwards. Therefore, if the image format is part of the test directory path, _filter_testdir will no longer apply and the actual output will differ from the reference output even in case of success. For example, TEST_DIR might be "/tmp/test-qcow2", in which case _filter_imgfmt first transforms this to "/tmp/test-IMGFMT" which is no longer recognized as the TEST_DIR by _filter_testdir. Fix this by not applying _filter_imgfmt in do_run_qemu() but in run_qemu() instead, and only after _filter_testdir. Signed-off-by: Max Reitz <mreitz@redhat.com> --- tests/qemu-iotests/195 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)