[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/22] tests/qtest: hd-geo-test: Check for missing devices
From: |
Thomas Huth |
Subject: |
[PULL 12/22] tests/qtest: hd-geo-test: Check for missing devices |
Date: |
Tue, 14 Feb 2023 12:21:38 +0100 |
From: Fabiano Rosas <farosas@suse.de>
Don't include tests that require devices not available in the QEMU
binary.
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230208194700.11035-6-farosas@suse.de>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qtest/hd-geo-test.c | 38 +++++++++++++++++++++++++-------------
1 file changed, 25 insertions(+), 13 deletions(-)
diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c
index 4a7628077b..5aa258a2b3 100644
--- a/tests/qtest/hd-geo-test.c
+++ b/tests/qtest/hd-geo-test.c
@@ -1090,30 +1090,42 @@ int main(int argc, char **argv)
qtest_add_func("hd-geo/override/ide", test_override_ide);
if (qtest_has_device("lsi53c895a")) {
qtest_add_func("hd-geo/override/scsi", test_override_scsi);
- qtest_add_func("hd-geo/override/scsi_2_controllers",
- test_override_scsi_2_controllers);
+ if (qtest_has_device("virtio-scsi-pci")) {
+ qtest_add_func("hd-geo/override/scsi_2_controllers",
+ test_override_scsi_2_controllers);
+ }
}
- qtest_add_func("hd-geo/override/virtio_blk", test_override_virtio_blk);
qtest_add_func("hd-geo/override/zero_chs", test_override_zero_chs);
- qtest_add_func("hd-geo/override/scsi_hot_unplug",
- test_override_scsi_hot_unplug);
- qtest_add_func("hd-geo/override/virtio_hot_unplug",
- test_override_virtio_hot_unplug);
+ if (qtest_has_device("virtio-scsi-pci")) {
+ qtest_add_func("hd-geo/override/scsi_hot_unplug",
+ test_override_scsi_hot_unplug);
+ }
+ if (qtest_has_device("virtio-blk-pci")) {
+ qtest_add_func("hd-geo/override/virtio_hot_unplug",
+ test_override_virtio_hot_unplug);
+ qtest_add_func("hd-geo/override/virtio_blk",
+ test_override_virtio_blk);
+ }
if (qtest_has_machine("q35")) {
qtest_add_func("hd-geo/override/sata", test_override_sata);
- qtest_add_func("hd-geo/override/virtio_blk_q35",
- test_override_virtio_blk_q35);
qtest_add_func("hd-geo/override/zero_chs_q35",
test_override_zero_chs_q35);
if (qtest_has_device("lsi53c895a")) {
qtest_add_func("hd-geo/override/scsi_q35",
test_override_scsi_q35);
}
- qtest_add_func("hd-geo/override/scsi_hot_unplug_q35",
- test_override_scsi_hot_unplug_q35);
- qtest_add_func("hd-geo/override/virtio_hot_unplug_q35",
- test_override_virtio_hot_unplug_q35);
+ if (qtest_has_device("virtio-scsi-pci")) {
+ qtest_add_func("hd-geo/override/scsi_hot_unplug_q35",
+ test_override_scsi_hot_unplug_q35);
+ }
+ if (qtest_has_device("virtio-blk-pci")) {
+ qtest_add_func("hd-geo/override/virtio_hot_unplug_q35",
+ test_override_virtio_hot_unplug_q35);
+ qtest_add_func("hd-geo/override/virtio_blk_q35",
+ test_override_virtio_blk_q35);
+ }
+
}
} else {
g_test_message("QTEST_QEMU_IMG not set or qemu-img missing; "
--
2.31.1
- [PULL 01/22] configure: Bump minimum Clang version to 10.0, (continued)
- [PULL 01/22] configure: Bump minimum Clang version to 10.0, Thomas Huth, 2023/02/14
- [PULL 03/22] meson: Disable libdw for static builds by default, Thomas Huth, 2023/02/14
- [PULL 02/22] meson: Add missing libdw knobs, Thomas Huth, 2023/02/14
- [PULL 04/22] build: deprecate --enable-gprof builds and remove from CI, Thomas Huth, 2023/02/14
- [PULL 05/22] tests/qtest/npcm7xx_pwm-test: Be less verbose unless V=2, Thomas Huth, 2023/02/14
- [PULL 06/22] hw/misc/sga: Remove the deprecated "sga" device, Thomas Huth, 2023/02/14
- [PULL 09/22] tests/qtest: Skip PXE tests for missing devices, Thomas Huth, 2023/02/14
- [PULL 07/22] include/hw: Do not include "hw/registerfields.h" in headers that don't need it, Thomas Huth, 2023/02/14
- [PULL 08/22] Do not include "qemu/error-report.h" in headers that do not need it, Thomas Huth, 2023/02/14
- [PULL 10/22] tests/qtest: Do not run lsi53c895a test if device is not present, Thomas Huth, 2023/02/14
- [PULL 12/22] tests/qtest: hd-geo-test: Check for missing devices,
Thomas Huth <=
- [PULL 11/22] tests/qtest: Add dependence on PCIE_PORT for virtio-net-failover.c, Thomas Huth, 2023/02/14
- [PULL 14/22] tests/qtest: Skip unplug tests that use missing devices, Thomas Huth, 2023/02/14
- [PULL 15/22] tests/qtest: drive_del-test: Skip tests that require missing devices, Thomas Huth, 2023/02/14
- [PULL 16/22] tests/qtest: Check for devices in bios-tables-test, Thomas Huth, 2023/02/14
- [PULL 18/22] tests/qemu-iotests: Require virtio-scsi-pci, Thomas Huth, 2023/02/14
- [PULL 17/22] tests/qtest: Do not include hexloader-test if loader device is not present, Thomas Huth, 2023/02/14
- [PULL 19/22] tests/qtest: bios-tables-test: Skip if missing configs, Thomas Huth, 2023/02/14
- [PULL 21/22] tests/tcg/s390x: Use -nostdlib for softmmu tests, Thomas Huth, 2023/02/14
- [PULL 20/22] tests/qtest: Don't build virtio-serial-test.c if device not present, Thomas Huth, 2023/02/14
- [PULL 22/22] hw/s390x/event-facility: Replace DO_UPCAST(SCLPEvent) by SCLP_EVENT(), Thomas Huth, 2023/02/14