[PATCH 03/20] qemuxml2argvtest: Drop 'qemu-4.1' variants of all audio tests

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Minimum qemu version will be bumped to qemu-4.2 so we no longer need to
care about configuring audiodevs via the environment variables.

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 .../audio-alsa-best.x86_64-4.1.0.args         | 46 -----------------
 .../audio-alsa-full.x86_64-4.1.0.err          |  1 -
 .../audio-alsa-minimal.x86_64-4.1.0.args      | 33 -------------
 .../audio-coreaudio-best.x86_64-4.1.0.args    | 46 -----------------
 .../audio-coreaudio-full.x86_64-4.1.0.err     |  1 -
 .../audio-coreaudio-minimal.x86_64-4.1.0.args | 33 -------------
 ...audio-default-nographics.x86_64-4.1.0.args | 33 -------------
 .../audio-file-best.x86_64-4.1.0.args         | 45 -----------------
 .../audio-file-full.x86_64-4.1.0.err          |  1 -
 .../audio-file-minimal.x86_64-4.1.0.args      | 33 -------------
 .../audio-jack-full.x86_64-4.1.0.err          |  1 -
 .../audio-jack-minimal.x86_64-4.1.0.err       |  1 -
 .../audio-many-backends.x86_64-4.1.0.err      |  1 -
 .../audio-none-best.x86_64-4.1.0.args         | 44 -----------------
 .../audio-none-full.x86_64-4.1.0.err          |  1 -
 .../audio-none-minimal.x86_64-4.1.0.args      | 33 -------------
 .../audio-oss-best.x86_64-4.1.0.args          | 49 -------------------
 .../audio-oss-full.x86_64-4.1.0.err           |  1 -
 .../audio-oss-minimal.x86_64-4.1.0.args       | 33 -------------
 .../audio-pulseaudio-best.x86_64-4.1.0.args   | 48 ------------------
 .../audio-pulseaudio-full.x86_64-4.1.0.err    |  1 -
 ...audio-pulseaudio-minimal.x86_64-4.1.0.args | 33 -------------
 .../audio-sdl-best.x86_64-4.1.0.args          | 46 -----------------
 .../audio-sdl-full.x86_64-4.1.0.err           |  1 -
 .../audio-sdl-minimal.x86_64-4.1.0.args       | 33 -------------
 .../audio-spice-best.x86_64-4.1.0.args        | 45 -----------------
 .../audio-spice-full.x86_64-4.1.0.err         |  1 -
 .../audio-spice-minimal.x86_64-4.1.0.args     | 34 -------------
 tests/qemuxml2argvtest.c                      | 35 -------------
 29 files changed, 713 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-alsa-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-file-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-jack-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-jack-minimal.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-many-backends.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-none-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-oss-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-sdl-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-spice-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args

File deletions are truncated from the mail posting.


diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index b801bd43d8..8d76472c0c 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1094,17 +1094,6 @@ mymain(void)
     DO_TEST("boot-complex",
             QEMU_CAPS_VIRTIO_BLK_SCSI);

-    /* Simplest possible <audio>, all supported with ENV */
-    DO_TEST_CAPS_VER("audio-none-minimal", "4.1.0");
-    DO_TEST_CAPS_VER("audio-alsa-minimal", "4.1.0");
-    DO_TEST_CAPS_VER("audio-coreaudio-minimal", "4.1.0");
-    DO_TEST_CAPS_VER_PARSE_ERROR("audio-jack-minimal", "4.1.0");
-    DO_TEST_CAPS_VER("audio-oss-minimal", "4.1.0");
-    DO_TEST_CAPS_VER("audio-pulseaudio-minimal", "4.1.0");
-    DO_TEST_CAPS_VER("audio-sdl-minimal", "4.1.0");
-    DO_TEST_CAPS_VER("audio-spice-minimal", "4.1.0");
-    DO_TEST_CAPS_VER("audio-file-minimal", "4.1.0");
-
     DO_TEST_CAPS_LATEST("audio-none-minimal");
     DO_TEST_CAPS_LATEST("audio-alsa-minimal");
     DO_TEST_CAPS_LATEST("audio-coreaudio-minimal");
@@ -1115,16 +1104,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST("audio-spice-minimal");
     DO_TEST_CAPS_LATEST("audio-file-minimal");

-    /* Best <audio> still compat with old ENV */
-    DO_TEST_CAPS_VER("audio-none-best", "4.1.0");
-    DO_TEST_CAPS_VER("audio-alsa-best", "4.1.0");
-    DO_TEST_CAPS_VER("audio-coreaudio-best", "4.1.0");
-    DO_TEST_CAPS_VER("audio-oss-best", "4.1.0");
-    DO_TEST_CAPS_VER("audio-pulseaudio-best", "4.1.0");
-    DO_TEST_CAPS_VER("audio-sdl-best", "4.1.0");
-    DO_TEST_CAPS_VER("audio-spice-best", "4.1.0");
-    DO_TEST_CAPS_VER("audio-file-best", "4.1.0");
-
     DO_TEST_CAPS_LATEST("audio-none-best");
     DO_TEST_CAPS_LATEST("audio-alsa-best");
     DO_TEST_CAPS_LATEST("audio-coreaudio-best");
@@ -1134,17 +1113,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST("audio-spice-best");
     DO_TEST_CAPS_LATEST("audio-file-best");

-    /* Full <audio> only compat with new QEMU -audiodev args */
-    DO_TEST_CAPS_VER_PARSE_ERROR("audio-none-full", "4.1.0");
-    DO_TEST_CAPS_VER_PARSE_ERROR("audio-alsa-full", "4.1.0");
-    DO_TEST_CAPS_VER_PARSE_ERROR("audio-coreaudio-full", "4.1.0");
-    DO_TEST_CAPS_VER_PARSE_ERROR("audio-jack-full", "4.1.0");
-    DO_TEST_CAPS_VER_PARSE_ERROR("audio-oss-full", "4.1.0");
-    DO_TEST_CAPS_VER_PARSE_ERROR("audio-pulseaudio-full", "4.1.0");
-    DO_TEST_CAPS_VER_PARSE_ERROR("audio-sdl-full", "4.1.0");
-    DO_TEST_CAPS_VER_PARSE_ERROR("audio-spice-full", "4.1.0");
-    DO_TEST_CAPS_VER_PARSE_ERROR("audio-file-full", "4.1.0");
-
     DO_TEST_CAPS_LATEST("audio-none-full");
     DO_TEST_CAPS_LATEST("audio-alsa-full");
     DO_TEST_CAPS_LATEST("audio-coreaudio-full");
@@ -1155,8 +1123,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST("audio-spice-full");
     DO_TEST_CAPS_LATEST("audio-file-full");

-    /* Multiple backends not supported with ENV */
-    DO_TEST_CAPS_VER_PARSE_ERROR("audio-many-backends", "4.1.0");
     DO_TEST_CAPS_LATEST("audio-many-backends");

     /* Validate auto-creation of <audio> for legacy compat */
@@ -1179,7 +1145,6 @@ mymain(void)

     g_setenv("QEMU_AUDIO_DRV", "alsa", TRUE);
     driver.config->nogfxAllowHostAudio = true;
-    DO_TEST_CAPS_VER("audio-default-nographics", "4.1.0");
     DO_TEST_CAPS_LATEST("audio-default-nographics");
     driver.config->nogfxAllowHostAudio = false;
     g_unsetenv("QEMU_AUDIO_DRV");
-- 
2.36.1




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux