qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-riscv@nongnu.org, "Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH 6/8] tests/qtest: Disable numa-test if the default machine is not available
Date: Thu,  5 Sep 2024 21:14:32 +0200	[thread overview]
Message-ID: <20240905191434.694440-7-thuth@redhat.com> (raw)
In-Reply-To: <20240905191434.694440-1-thuth@redhat.com>

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".

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 587e1dc47e..70f240e8b1 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -141,7 +141,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
@@ -174,11 +175,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



  parent reply	other threads:[~2024-09-05 19:15 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-05 19:14 [PATCH 0/8] Allow check-qtest with "--without-default-devices" Thomas Huth
2024-09-05 19:14 ` [PATCH 1/8] tests/qtest/migration: Add a check for the availability of the "pc" machine Thomas Huth
2024-09-05 19:14 ` [PATCH 2/8] tests/qtest/cdrom-test: Improve the machine detection in the cdrom test Thomas Huth
2024-09-05 19:14 ` [PATCH 3/8] tests/qtest/boot-order-test: Make the machine name mandatory in this test Thomas Huth
2024-09-06  7:59   ` Philippe Mathieu-Daudé
2024-09-06  8:04     ` Thomas Huth
2024-09-06  8:07       ` Philippe Mathieu-Daudé
2024-09-05 19:14 ` [PATCH 4/8] tests/qtest/hd-geo-test: Check for availability of "pc" machine before using it Thomas Huth
2024-09-06  7:50   ` Philippe Mathieu-Daudé
2024-09-06  7:52     ` Thomas Huth
2024-09-05 19:14 ` [PATCH 5/8] tests/qtest/meson.build: Add more CONFIG switches checks for the x86 tests Thomas Huth
2024-09-05 19:14 ` Thomas Huth [this message]
2024-09-05 19:14 ` [PATCH 7/8] Revert "target/riscv: Restrict semihosting to TCG" Thomas Huth
2024-09-05 19:53   ` Peter Maydell
2024-09-06  8:15     ` Thomas Huth
2024-09-06  8:16     ` Philippe Mathieu-Daudé
2024-09-05 19:14 ` [PATCH 8/8] .gitlab-ci.d/buildtest: Build most targets in the build-without-defaults job Thomas Huth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240905191434.694440-7-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-riscv@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).