| Message ID | 20171115180732.31753-1-mreitz@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | iotests: Make 087 pass without AIO enabled | expand |
On 11/15/2017 12:07 PM, Max Reitz wrote: > If AIO has not been enabled in the qemu build that is to be tested, we > should skip the "aio=native without O_DIRECT" test instead of failing. > > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > Cleber wanted to fix this in July with his "build configuration query > tool and conditional (qemu-io)test skip" series > (https://lists.gnu.org/archive/html/qemu-block/2017-07/msg01303.html), > but unfortunately there hasn't been any activity on that (as far as I > can see), so let's just solve it the simple way. > --- > tests/qemu-iotests/087 | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) Yep, that's about as simple as possible. Reviewed-by: Eric Blake <eblake@redhat.com>
On 2017-11-15 19:07, Max Reitz wrote: > If AIO has not been enabled in the qemu build that is to be tested, we > should skip the "aio=native without O_DIRECT" test instead of failing. > > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > Cleber wanted to fix this in July with his "build configuration query > tool and conditional (qemu-io)test skip" series > (https://lists.gnu.org/archive/html/qemu-block/2017-07/msg01303.html), > but unfortunately there hasn't been any activity on that (as far as I > can see), so let's just solve it the simple way. > --- > tests/qemu-iotests/087 | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) Applied to my block branch: https://github.com/XanClic/qemu/commits/block Max
diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087 index 27ab6c5151..2561a14456 100755 --- a/tests/qemu-iotests/087 +++ b/tests/qemu-iotests/087 @@ -102,7 +102,14 @@ echo echo === aio=native without O_DIRECT === echo -run_qemu <<EOF +# Skip this test if AIO is not enabled in this build +function run_qemu_filter_aio() +{ + run_qemu "$@" | \ + sed -e 's/is not supported in this build/it requires cache.direct=on, which was not specified/' +} + +run_qemu_filter_aio <<EOF { "execute": "qmp_capabilities" } { "execute": "blockdev-add", "arguments": {
If AIO has not been enabled in the qemu build that is to be tested, we should skip the "aio=native without O_DIRECT" test instead of failing. Signed-off-by: Max Reitz <mreitz@redhat.com> --- Cleber wanted to fix this in July with his "build configuration query tool and conditional (qemu-io)test skip" series (https://lists.gnu.org/archive/html/qemu-block/2017-07/msg01303.html), but unfortunately there hasn't been any activity on that (as far as I can see), so let's just solve it the simple way. --- tests/qemu-iotests/087 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)