diff options
| author | Max Reitz <mreitz@redhat.com> | 2017-10-09 18:34:55 +0200 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2017-10-26 15:01:13 +0200 |
| commit | 44673a0b59d1fafd1abfdf35a1ac924b856c6ad5 (patch) | |
| tree | af74021733aaec5831b21522a6dc4e1862c262ae | |
| parent | f700ceae8ab57a5c8973932c14f9abba1f99e5a8 (diff) | |
| download | qemu-44673a0b59d1fafd1abfdf35a1ac924b856c6ad5.zip qemu-44673a0b59d1fafd1abfdf35a1ac924b856c6ad5.tar.gz qemu-44673a0b59d1fafd1abfdf35a1ac924b856c6ad5.tar.bz2 | |
iotests: Pull _filter_actual_image_size from 67/87
Tests 067 and 087 filter the actual image size because it depends on the
host filesystem (and is not part of the respective test). Since this is
generally true, we should have a common filter function for this, so
let's pull out the sed line from both tests into such a function.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20171009163456.485-2-mreitz@redhat.com
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
| -rwxr-xr-x | tests/qemu-iotests/067 | 2 | ||||
| -rwxr-xr-x | tests/qemu-iotests/087 | 2 | ||||
| -rw-r--r-- | tests/qemu-iotests/common.filter | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067 index ee9595f..9d561ef 100755 --- a/tests/qemu-iotests/067 +++ b/tests/qemu-iotests/067 @@ -56,7 +56,7 @@ _filter_qmp_events() function run_qemu() { do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp | _filter_qemu \ - | sed -e 's/\("actual-size":\s*\)[0-9]\+/\1SIZE/g' \ + | _filter_actual_image_size \ | _filter_generated_node_ids | _filter_qmp_events } diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087 index f8e4903..27ab6c5 100755 --- a/tests/qemu-iotests/087 +++ b/tests/qemu-iotests/087 @@ -46,7 +46,7 @@ function run_qemu() { do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp \ | _filter_qemu | _filter_imgfmt \ - | sed -e 's/\("actual-size":\s*\)[0-9]\+/\1SIZE/g' + | _filter_actual_image_size } size=128M diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index 227b37e..873ca6b 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -105,6 +105,12 @@ _filter_block_job_len() sed -e 's/, "len": [0-9]\+,/, "len": LEN,/g' } +# replace actual image size (depends on the host filesystem) +_filter_actual_image_size() +{ + sed -s 's/\("actual-size":\s*\)[0-9]\+/\1SIZE/g' +} + # replace driver-specific options in the "Formatting..." line _filter_img_create() { |