From: Bin Meng <bin.m...@windriver.com>
All of the virtio-net-test test cases require socketpair() to do the
test setup.
Signed-off-by: Bin Meng <bin.m...@windriver.com>
---
tests/qtest/virtio-net-test.c | 6 ------
tests/qtest/meson.build | 3 +--
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/tests/qtest/virtio-net-test.c b/tests/qtest/virtio-net-test.c
index 6ded252901..d44c3d9666 100644
--- a/tests/qtest/virtio-net-test.c
+++ b/tests/qtest/virtio-net-test.c
@@ -26,8 +26,6 @@
#define QVIRTIO_NET_TIMEOUT_US (30 * 1000 * 1000)
#define VNET_HDR_SIZE sizeof(struct virtio_net_hdr_mrg_rxbuf)
-#ifndef _WIN32
-
static void rx_test(QVirtioDevice *dev,
QGuestAllocator *alloc, QVirtQueue *vq,
int socket)
@@ -165,8 +163,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;
@@ -324,10 +320,8 @@ static void register_virtio_net_test(void)
};
qos_add_test("hotplug", "virtio-net-pci", hotplug, &opts);
-#ifndef _WIN32
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);
/* These tests do not need a loopback backend. */
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index 9d0f82bf1c..72bb9e21f3 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -259,7 +259,6 @@ qos_test_ss.add(
'usb-hcd-ohci-test.c',
'virtio-test.c',
'virtio-blk-test.c',
- 'virtio-net-test.c',
'virtio-rng-test.c',
'virtio-scsi-test.c',
'virtio-serial-test.c',
@@ -267,7 +266,7 @@ qos_test_ss.add(
'vmxnet3-test.c',
)
if config_host.has_key('CONFIG_POSIX')
- qos_test_ss.add(files('e1000e-test.c'))
+ qos_test_ss.add(files('e1000e-test.c', 'virtio-net-test.c'))
endif
if have_virtfs
qos_test_ss.add(files('virtio-9p-test.c'))
--
2.34.1
