[PATCH V2] tests: Fix qemuxml2xmltest with audio driver defined in env

If QEMU_AUDIO_DRV is defined in the build host environment, several tests in qemuxml2xmltest fail. $ env | grep -i audio AUDIODRIVER=pulseaudio QEMU_AUDIO_DRV=pa SDL_AUDIODRIVER=pulse An example test failure with the above environment 907) QEMU XML-2-XML-active video-virtio-gpu-sdl-gl In 'libvirt/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml': Offset 1244 Expect [v] Actual [audio id='1' type='pulseaudio'/> <v] Scrub QEMU_AUDIO_DRV from the environment before executing the tests in qemuxml2xmltest. SDL_AUDIODRIVER also needs scrubbed since it will be examined if QEMU_AUDIO_DRV=sdl. Signed-off-by: Jim Fehlig <jfehlig@suse.com> --- v2: Also scrub SDL_AUDIODRIVER tests/qemuxml2xmltest.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 137f1871af..823dd40f50 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -198,6 +198,8 @@ mymain(void) * using ADD_ENV_COPY, otherwise these tests may fail due to unexpected * values for these envvars */ g_setenv("PATH", "/bin", TRUE); + g_unsetenv("QEMU_AUDIO_DRV"); + g_unsetenv("SDL_AUDIODRIVER"); DO_TEST("minimal", NONE); DO_TEST_CAPS_LATEST("genid"); -- 2.30.1

On Thu, Apr 01, 2021 at 11:44:59AM -0600, Jim Fehlig wrote:
If QEMU_AUDIO_DRV is defined in the build host environment, several tests in qemuxml2xmltest fail.
$ env | grep -i audio AUDIODRIVER=pulseaudio QEMU_AUDIO_DRV=pa SDL_AUDIODRIVER=pulse
An example test failure with the above environment
907) QEMU XML-2-XML-active video-virtio-gpu-sdl-gl In 'libvirt/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml': Offset 1244 Expect [v] Actual [audio id='1' type='pulseaudio'/> <v]
Scrub QEMU_AUDIO_DRV from the environment before executing the tests in qemuxml2xmltest. SDL_AUDIODRIVER also needs scrubbed since it will be examined if QEMU_AUDIO_DRV=sdl.
Signed-off-by: Jim Fehlig <jfehlig@suse.com> ---
v2: Also scrub SDL_AUDIODRIVER
tests/qemuxml2xmltest.c | 2 ++ 1 file changed, 2 insertions(+)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
participants (2)
-
Daniel P. Berrangé
-
Jim Fehlig