[v2] qtests vs. default devices

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

Fabiano Rosas posted 12 patches 3 years ago

Diff against v1 v3
Download mbox

Maintainers: Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <ani@anisinha.ca>, Thomas Huth <thuth@redhat.com>, Laurent Vivier <lvivier@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Alexander Bulekov <alxndr@bu.edu>, Bandan Das <bsd@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Darren Kenny <darren.kenny@oracle.com>, Qiuhao Li <Qiuhao.Li@outlook.com>, Fam Zheng <fam@euphon.net>

There is a newer version of this series

Expand all Fold all

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

Posted by Fabiano Rosas 3 years ago

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'] : [])
+)
+
 if config_host.has_key('CONFIG_POSIX')
   qos_test_ss.add(files('e1000e-test.c'))
 endif
-- 
2.35.3

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

Posted by Thomas Huth 3 years ago

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