On 18/03/21 16:36, Philippe Mathieu-Daudé wrote:
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index 66ee9fbf450..d7f3fad51c1 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -217,13 +217,17 @@
'emc141x-test.c',
'usb-hcd-ohci-test.c',
'virtio-test.c',
- 'virtio-blk-test.c',
- 'virtio-net-test.c',
- 'virtio-rng-test.c',
- 'virtio-scsi-test.c',
'virtio-serial-test.c',
'vmxnet3-test.c',
)
+if config_all_devices.has_key('CONFIG_VIRTIO_PCI')
+ qos_test_ss.add(
+ 'virtio-blk-test.c',
+ 'virtio-net-test.c',
+ 'virtio-rng-test.c',
+ 'virtio-scsi-test.c',
+ )
+endif
if have_virtfs
qos_test_ss.add(files('virtio-9p-test.c'))
endif
I don't understand, what would this be trying to do? (And besides, why
would it work? The CI failure is in qemu-iotests that has no connection
to qtest at all).
Maybe you need to complete it for your arch? I've been using that:
Instead of completing it, you can drop your arch from virtio-*-pci, so:
+ { "virtio-blk-pci", "virtio-blk", QEMU_ARCH_ALL
+ & ~(QEMU_ARCH_S390X |
QEMU_ARCH_M68K) },
but do not add m68k anywhere.
Paolo
