Re: [PATCH 2/3] tests: qemuxml2*: Add QEMU_CAPS_EGL_HEADLESS to fake-caps tests using egl-headless graphics

[Thomas Huth <thuth@xxxxxxxxxx>]

On 15/06/2021 18.04, Peter Krempa wrote:
> Next commit will modify the code so that it validates whether
> egl-headless is present. Certain tests need to get the egl-headless
> capability to keep working properly.
>
> Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
> ---
>   tests/qemuxml2argvtest.c | 9 ++++++---
>   tests/qemuxml2xmltest.c  | 8 +++++---
>   2 files changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> index 7fed871c9e..9df28658b9 100644
> --- a/tests/qemuxml2argvtest.c
> +++ b/tests/qemuxml2argvtest.c
> @@ -1495,7 +1495,8 @@ mymain(void)
>       DO_TEST_CAPS_ARCH_LATEST("disk-arm-virtio-sd", "aarch64");
>
>       DO_TEST("graphics-egl-headless",
> -            QEMU_CAPS_DEVICE_CIRRUS_VGA);
> +            QEMU_CAPS_DEVICE_CIRRUS_VGA,
> +            QEMU_CAPS_EGL_HEADLESS);
>       DO_TEST_CAPS_LATEST("graphics-egl-headless");
>       DO_TEST_CAPS_LATEST("graphics-egl-headless-rendernode");
>
> @@ -1539,7 +1540,8 @@ mymain(void)
>       VIR_FREE(driver.config->vncTLSx509certdir);
>       DO_TEST("graphics-vnc-egl-headless",
>               QEMU_CAPS_VNC,
> -            QEMU_CAPS_DEVICE_CIRRUS_VGA);
> +            QEMU_CAPS_DEVICE_CIRRUS_VGA,
> +            QEMU_CAPS_EGL_HEADLESS);
>
>       DO_TEST("graphics-sdl",
>               QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_SDL);
> @@ -1600,7 +1602,8 @@ mymain(void)
>       driver.config->spiceAutoUnixSocket = false;
>       DO_TEST("graphics-spice-egl-headless",
>               QEMU_CAPS_SPICE,
> -            QEMU_CAPS_DEVICE_QXL);
> +            QEMU_CAPS_DEVICE_QXL,
> +            QEMU_CAPS_EGL_HEADLESS);
>       DO_TEST_CAPS_LATEST_PARSE_ERROR("graphics-spice-invalid-egl-headless");
>       DO_TEST_CAPS_LATEST("graphics-spice-gl-auto-rendernode");
>
> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
> index 2b37cb839b..40e027aaa4 100644
> --- a/tests/qemuxml2xmltest.c
> +++ b/tests/qemuxml2xmltest.c
> @@ -371,7 +371,8 @@ mymain(void)
>               QEMU_CAPS_VNC);
>       DO_TEST("graphics-vnc-egl-headless",
>               QEMU_CAPS_DEVICE_CIRRUS_VGA,
> -            QEMU_CAPS_VNC);
> +            QEMU_CAPS_VNC,
> +            QEMU_CAPS_EGL_HEADLESS);
>
>       DO_TEST_CAPS_ARCH_LATEST("default-video-type-aarch64", "aarch64");
>       DO_TEST_CAPS_ARCH_LATEST("default-video-type-ppc64", "ppc64");
> @@ -414,12 +415,13 @@ mymain(void)
>       cfg->spiceTLS = false;
>       DO_TEST("graphics-spice-egl-headless",
>               QEMU_CAPS_DEVICE_QXL,
> -            QEMU_CAPS_SPICE);
> +            QEMU_CAPS_SPICE,
> +            QEMU_CAPS_EGL_HEADLESS);
>
>       DO_TEST("graphics-egl-headless-rendernode",
>               QEMU_CAPS_DEVICE_CIRRUS_VGA,
>               QEMU_CAPS_EGL_HEADLESS_RENDERNODE,
> -            QEMU_CAPS_DEVICE_CIRRUS_VGA);
> +            QEMU_CAPS_EGL_HEADLESS);
>
>       DO_TEST("input-usbmouse", NONE);
>       DO_TEST("input-usbtablet", NONE);

Reviewed-by: Thomas Huth <thuth@xxxxxxxxxx>