[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 11/39] tests/qtest: Skip running virtio-net-test cases that re
From: |
Bin Meng |
Subject: |
[PATCH v2 11/39] tests/qtest: Skip running virtio-net-test cases that require socketpair() for win32 |
Date: |
Tue, 20 Sep 2022 18:31:31 +0800 |
From: Bin Meng <bin.meng@windriver.com>
Some of the virtio-net-test test cases require socketpair() to do the
test setup. Skip them for win32.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
Changes in v2:
- Change to skip only part of the virtio-net-test cases that require
socketpair() intead of disabling all of them
tests/qtest/virtio-net-test.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/tests/qtest/virtio-net-test.c b/tests/qtest/virtio-net-test.c
index 6ded252901..dff43f0f60 100644
--- a/tests/qtest/virtio-net-test.c
+++ b/tests/qtest/virtio-net-test.c
@@ -165,8 +165,6 @@ static void stop_cont_test(void *obj, void *data,
QGuestAllocator *t_alloc)
rx_stop_cont_test(dev, t_alloc, rx, sv[0]);
}
-#endif
-
static void hotplug(void *obj, void *data, QGuestAllocator *t_alloc)
{
QVirtioPCIDevice *dev = obj;
@@ -286,6 +284,8 @@ static void *virtio_net_test_setup(GString *cmd_line, void
*arg)
return sv;
}
+#endif /* _WIN32 */
+
static void large_tx(void *obj, void *data, QGuestAllocator *t_alloc)
{
QVirtioNet *dev = obj;
@@ -319,16 +319,15 @@ static void *virtio_net_test_setup_nosocket(GString
*cmd_line, void *arg)
static void register_virtio_net_test(void)
{
- QOSGraphTestOptions opts = {
- .before = virtio_net_test_setup,
- };
+ QOSGraphTestOptions opts = { 0 };
- qos_add_test("hotplug", "virtio-net-pci", hotplug, &opts);
#ifndef _WIN32
+ opts.before = virtio_net_test_setup;
+ qos_add_test("hotplug", "virtio-net-pci", hotplug, &opts);
qos_add_test("basic", "virtio-net", send_recv_test, &opts);
qos_add_test("rx_stop_cont", "virtio-net", stop_cont_test, &opts);
-#endif
qos_add_test("announce-self", "virtio-net", announce_self, &opts);
+#endif
/* These tests do not need a loopback backend. */
opts.before = virtio_net_test_setup_nosocket;
--
2.34.1
- [PATCH v2 02/39] tests/qtest: i440fx-test: Rewrite create_blob_file() to be portable, (continued)
- [PATCH v2 02/39] tests/qtest: i440fx-test: Rewrite create_blob_file() to be portable, Bin Meng, 2022/09/20
- [PATCH v2 10/39] hw/usb: dev-mtp: Use g_mkdir(), Bin Meng, 2022/09/20
- [PATCH v2 06/39] util/qemu-sockets: Use g_get_tmp_dir() to get the directory for temporary files, Bin Meng, 2022/09/20
- [PATCH v2 07/39] tests: Avoid using hardcoded /tmp in test cases, Bin Meng, 2022/09/20
- [PATCH v2 09/39] fsdev/virtfs-proxy-helper: Use g_mkdir(), Bin Meng, 2022/09/20
- [PATCH v2 11/39] tests/qtest: Skip running virtio-net-test cases that require socketpair() for win32,
Bin Meng <=
- [PATCH v2 12/39] tests/qtest: Build test-filter-{mirror, redirector} cases for posix only, Bin Meng, 2022/09/20
- [PATCH v2 13/39] tests/qtest: qmp-test: Skip running test_qmp_oob for win32, Bin Meng, 2022/09/20
- [PATCH v2 15/39] tests/qtest: libqtest: Adapt global_qtest declaration for win32, Bin Meng, 2022/09/20
- [PATCH v2 16/39] tests/qtest: Use send/recv for socket communication, Bin Meng, 2022/09/20
- [PATCH v2 14/39] accel/qtest: Implement a portable qtest accelerator, Bin Meng, 2022/09/20
- [PATCH v2 18/39] tests/qtest: libqtest: Install signal handler via signal(), Bin Meng, 2022/09/20
- [PATCH v2 20/39] tests/qtest: {ahci, ide}-test: Use relative path for temporary files for win32, Bin Meng, 2022/09/20