Re: [PATCH v2 04/12] tests/qtest: Don't build virtio-serial-test.c if device not present

[Thomas Huth]

On 08/02/2023 20.46, Fabiano Rosas wrote:
> The virtconsole device might not be present in the QEMU build that is
> being tested.
>
> Signed-off-by: Fabiano Rosas <farosas@suse.de>
> ---
>   tests/qtest/meson.build | 6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
> index 5c8b031ce0..eccdfca235 100644
> --- a/tests/qtest/meson.build
> +++ b/tests/qtest/meson.build
> @@ -255,10 +255,14 @@ qos_test_ss.add(
>     'virtio-net-test.c',
>     'virtio-rng-test.c',
>     'virtio-scsi-test.c',
> -  'virtio-serial-test.c',
>     'virtio-iommu-test.c',
>     'vmxnet3-test.c',
>   )
> +
> +qos_test_ss.add(
> +  (config_all_devices.has_key('CONFIG_VIRTIO_SERIAL') ? 
> ['virtio-serial-test.c'] : [])
> +)

The check below uses "if config ..." instead ... so for consistency, I think 
it would be nicer to do:

if config_all_devices.has_key('CONFIG_VIRTIO_SERIAL')
    qos_test_ss.add(files('virtio-serial-test.c'))
endif

 Thomas


>   if config_host.has_key('CONFIG_POSIX')
>     qos_test_ss.add(files('e1000e-test.c'))
>   endif