[PATCH 19/20] qemuxml2(argv|xml)test: Remove use of QEMU_CAPS_AUDIODEV in fake-caps tests
The code no longer uses the capability so the tests don't need to assert
it.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvtest.c | 2 +-
tests/qemuxml2xmltest.c | 20 +++++++++-----------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 4897d2f87b..07bd40d6e9 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1490,7 +1490,7 @@ mymain(void)
DO_TEST("graphics-dbus-p2p",
QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_DISPLAY_DBUS);
DO_TEST("graphics-dbus-audio",
- QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_DISPLAY_DBUS, QEMU_CAPS_AUDIODEV);
+ QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_DISPLAY_DBUS);
DO_TEST("graphics-dbus-chardev",
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_DEVICE_CIRRUS_VGA,
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 4eabefada0..9db28b14cf 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -411,8 +411,7 @@ mymain(void)
QEMU_CAPS_DISPLAY_DBUS);
DO_TEST("graphics-dbus-audio",
QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_DISPLAY_DBUS,
- QEMU_CAPS_AUDIODEV);
+ QEMU_CAPS_DISPLAY_DBUS);
DO_TEST("graphics-dbus-chardev",
QEMU_CAPS_DEVICE_CIRRUS_VGA,
QEMU_CAPS_DISPLAY_DBUS);
@@ -1401,18 +1400,17 @@ mymain(void)
DO_TEST_NOCAPS("audio-file-best");
/* Full <audio> only compat with new QEMU -audiodev args */
- DO_TEST("audio-none-full", QEMU_CAPS_AUDIODEV);
- DO_TEST("audio-alsa-full", QEMU_CAPS_AUDIODEV);
- DO_TEST("audio-coreaudio-full", QEMU_CAPS_AUDIODEV);
- DO_TEST("audio-jack-full", QEMU_CAPS_AUDIODEV);
- DO_TEST("audio-oss-full", QEMU_CAPS_AUDIODEV);
- DO_TEST("audio-pulseaudio-full", QEMU_CAPS_AUDIODEV);
- DO_TEST("audio-sdl-full", QEMU_CAPS_AUDIODEV);
+ DO_TEST_NOCAPS("audio-none-full");
+ DO_TEST_NOCAPS("audio-alsa-full");
+ DO_TEST_NOCAPS("audio-coreaudio-full");
+ DO_TEST_NOCAPS("audio-jack-full");
+ DO_TEST_NOCAPS("audio-oss-full");
+ DO_TEST_NOCAPS("audio-pulseaudio-full");
+ DO_TEST_NOCAPS("audio-sdl-full");
DO_TEST("audio-spice-full",
- QEMU_CAPS_AUDIODEV,
QEMU_CAPS_SPICE,
QEMU_CAPS_DEVICE_CIRRUS_VGA);
- DO_TEST("audio-file-full", QEMU_CAPS_AUDIODEV);
+ DO_TEST_NOCAPS("audio-file-full");
DO_TEST_CAPS_LATEST("audio-many-backends");
--
2.36.1