[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/17] tests/qtest: Disable numa-test if the default machine is no
From: |
Thomas Huth |
Subject: |
[PULL 05/17] tests/qtest: Disable numa-test if the default machine is not available |
Date: |
Tue, 17 Sep 2024 12:35:28 +0200 |
The numa-test needs a default machine in the target binary to work
successfully, so don't try to run this test if the corresponding
machine has not been enabled, e.g. when QEMU has been configured with
"--without-default-devices".
Message-ID: <20240905191434.694440-7-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qtest/meson.build | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index ce0dba18cb..310865e49c 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -142,7 +142,8 @@ qtests_hppa = ['boot-serial-test'] + \
(config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
qtests_loongarch64 = qtests_filter + \
- ['boot-serial-test', 'numa-test']
+ (config_all_devices.has_key('CONFIG_LOONGARCH_VIRT') ? ['numa-test'] : []) +
\
+ ['boot-serial-test']
qtests_m68k = ['boot-serial-test'] + \
qtests_filter
@@ -175,11 +176,12 @@ qtests_ppc64 = \
(config_all_devices.has_key('CONFIG_POWERNV') ? ['pnv-xscom-test'] : []) +
\
(config_all_devices.has_key('CONFIG_POWERNV') ? ['pnv-spi-seeprom-test'] :
[]) + \
(config_all_devices.has_key('CONFIG_POWERNV') ? ['pnv-host-i2c-test'] : [])
+ \
+ (config_all_devices.has_key('CONFIG_PSERIES') ? ['numa-test'] : []) +
\
(config_all_devices.has_key('CONFIG_PSERIES') ? ['rtas-test'] : []) +
\
(slirp.found() ? ['pxe-test'] : []) + \
(config_all_devices.has_key('CONFIG_USB_UHCI') ? ['usb-hcd-uhci-test'] : [])
+ \
(config_all_devices.has_key('CONFIG_USB_XHCI_NEC') ? ['usb-hcd-xhci-test'] :
[]) + \
- qtests_pci + ['migration-test', 'numa-test', 'cpu-plug-test',
'drive_del-test']
+ qtests_pci + ['migration-test', 'cpu-plug-test', 'drive_del-test']
qtests_sh4 = (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ?
['endianness-test'] : [])
qtests_sh4eb = (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ?
['endianness-test'] : [])
--
2.46.0
- [PULL 00/17] s390x and test patches, Thomas Huth, 2024/09/17
- [PULL 01/17] tests/qtest/cdrom-test: Improve the machine detection in the cdrom test, Thomas Huth, 2024/09/17
- [PULL 03/17] tests/qtest/hd-geo-test: Check for availability of "pc" machine before using it, Thomas Huth, 2024/09/17
- [PULL 02/17] tests/qtest/boot-order-test: Make the machine name mandatory in this test, Thomas Huth, 2024/09/17
- [PULL 05/17] tests/qtest: Disable numa-test if the default machine is not available,
Thomas Huth <=
- [PULL 04/17] tests/qtest/meson.build: Add more CONFIG switches checks for the x86 tests, Thomas Huth, 2024/09/17
- [PULL 06/17] .gitlab-ci.d/buildtest: Build most targets in the build-without-defaults job, Thomas Huth, 2024/09/17
- [PULL 07/17] gitlab: fix logic for changing docker tag on stable branches, Thomas Huth, 2024/09/17
- [PULL 08/17] tests/qtest: replace assert(0) with g_assert_not_reached(), Thomas Huth, 2024/09/17
- [PULL 09/17] tests/unit: replace assert(0) with g_assert_not_reached(), Thomas Huth, 2024/09/17
- [PULL 10/17] include/hw/s390x: replace assert(false) with g_assert_not_reached(), Thomas Huth, 2024/09/17
- [PULL 14/17] system: Enable the device aliases for or1k, too, Thomas Huth, 2024/09/17
- [PULL 16/17] tests/functional: Move the mips64el fuloong2e test into the thorough category, Thomas Huth, 2024/09/17
- [PULL 13/17] system: Sort QEMU_ARCH_VIRTIO_PCI definition, Thomas Huth, 2024/09/17
- [PULL 11/17] tests/qtest: replace assert(false) with g_assert_not_reached(), Thomas Huth, 2024/09/17