aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2017-11-15 19:07:32 +0100
committerMax Reitz <mreitz@redhat.com>2017-11-17 18:21:31 +0100
commitc0012e9a22ef23507025daaad01de03dcc928eec (patch)
tree8f51bb1e380876bfa0a8310cd3ab0ed4d953efac
parent5e003f17ec518cd96f5d2ac23ce9e14144426235 (diff)
downloadqemu-arm-c0012e9a22ef23507025daaad01de03dcc928eec.tar.gz
iotests: Make 087 pass without AIO enabled
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> Message-id: 20171115180732.31753-1-mreitz@redhat.com Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Max Reitz <mreitz@redhat.com>
-rwxr-xr-xtests/qemu-iotests/0879
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087
index 27ab6c5..2561a14 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": {