[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 07/12] tests/qtest: Skip unplug tests that use missing devices
From: |
Fabiano Rosas |
Subject: |
[PATCH v2 07/12] tests/qtest: Skip unplug tests that use missing devices |
Date: |
Wed, 8 Feb 2023 16:46:55 -0300 |
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
tests/qtest/device-plug-test.c | 33 +++++++++++++++++++++++++++------
1 file changed, 27 insertions(+), 6 deletions(-)
diff --git a/tests/qtest/device-plug-test.c b/tests/qtest/device-plug-test.c
index 4f92617335..01cecd6e20 100644
--- a/tests/qtest/device-plug-test.c
+++ b/tests/qtest/device-plug-test.c
@@ -68,6 +68,11 @@ static void test_pci_unplug_request(void)
const char *arch = qtest_get_arch();
const char *machine_addition = "";
+ if (!qtest_has_device("virtio-mouse-pci")) {
+ g_test_skip("Device virtio-mouse-pci not available");
+ return;
+ }
+
if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
machine_addition = "-machine pc";
}
@@ -82,11 +87,17 @@ static void test_pci_unplug_request(void)
static void test_q35_pci_unplug_request(void)
{
+ QTestState *qtest;
+
+ if (!qtest_has_device("virtio-mouse-pci")) {
+ g_test_skip("Device virtio-mouse-pci not available");
+ return;
+ }
- QTestState *qtest = qtest_initf("-machine q35 "
- "-device pcie-root-port,id=p1 "
- "-device pcie-pci-bridge,bus=p1,id=b1 "
- "-device virtio-mouse-pci,bus=b1,id=dev0");
+ qtest = qtest_initf("-machine q35 "
+ "-device pcie-root-port,id=p1 "
+ "-device pcie-pci-bridge,bus=p1,id=b1 "
+ "-device virtio-mouse-pci,bus=b1,id=dev0");
process_device_remove(qtest, "dev0");
@@ -99,6 +110,11 @@ static void test_pci_unplug_json_request(void)
const char *arch = qtest_get_arch();
const char *machine_addition = "";
+ if (!qtest_has_device("virtio-mouse-pci")) {
+ g_test_skip("Device virtio-mouse-pci not available");
+ return;
+ }
+
if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
machine_addition = "-machine pc";
}
@@ -114,6 +130,7 @@ static void test_pci_unplug_json_request(void)
static void test_q35_pci_unplug_json_request(void)
{
+ QTestState *qtest;
const char *port = "-device \"{'driver': 'pcie-root-port', "
"'id': 'p1'}\"";
@@ -125,8 +142,12 @@ static void test_q35_pci_unplug_json_request(void)
"'bus': 'b1', "
"'id': 'dev0'}\"";
- QTestState *qtest = qtest_initf("-machine q35 %s %s %s",
- port, bridge, device);
+ if (!qtest_has_device("virtio-mouse-pci")) {
+ g_test_skip("Device virtio-mouse-pci not available");
+ return;
+ }
+
+ qtest = qtest_initf("-machine q35 %s %s %s", port, bridge, device);
process_device_remove(qtest, "dev0");
--
2.35.3
- [PATCH v2 00/12] qtests vs. default devices, Fabiano Rosas, 2023/02/08
- [PATCH v2 01/12] tests/qtest: Skip PXE tests for missing devices, Fabiano Rosas, 2023/02/08
- [PATCH v2 02/12] tests/qtest: Do not run lsi53c895a test if device is not present, Fabiano Rosas, 2023/02/08
- [PATCH v2 04/12] tests/qtest: Don't build virtio-serial-test.c if device not present, Fabiano Rosas, 2023/02/08
- [PATCH v2 05/12] tests/qtest: hd-geo-test: Check for missing devices, Fabiano Rosas, 2023/02/08
- [PATCH v2 03/12] tests/qtest: Add dependence on PCIE_PORT for virtio-net-failover.c, Fabiano Rosas, 2023/02/08
- [PATCH v2 07/12] tests/qtest: Skip unplug tests that use missing devices,
Fabiano Rosas <=
- [PATCH v2 06/12] test/qtest: Fix coding style in device-plug-test.c, Fabiano Rosas, 2023/02/08
- [PATCH v2 09/12] tests/qtest: Check for devices in bios-tables-test, Fabiano Rosas, 2023/02/08
- [PATCH v2 11/12] tests/qemu-iotests: Require virtio-scsi-pci, Fabiano Rosas, 2023/02/08
- [PATCH v2 08/12] tests/qtest: drive_del-test: Skip tests that require missing devices, Fabiano Rosas, 2023/02/08
- [PATCH v2 10/12] tests/qtest: Do not include hexloader-test if loader device is not present, Fabiano Rosas, 2023/02/08
- [PATCH v2 12/12] tests/qtest: bios-tables-test: Skip if missing configs, Fabiano Rosas, 2023/02/08