david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Run filter-redirector and -mirror test only on POSIX systems

Browse Source 
This way we can get rid of the ugly #ifdefs in the code which makes
it easier to extend later.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <1502951113-4246-2-git-send-email-thuth@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
Thomas Huth 2017-08-17 08:25:08 +02:00 committed by Cornelia Huck
parent b1b2feac94
commit 7f57d58d6a
3 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/Makefile.include
View File

@ -283,8 +283,8 @@ ifeq ($(CONFIG_VHOST_USER_NET_TEST_i386),)
check-qtest-x86_64-$(CONFIG_VHOST_USER_NET_TEST_x86_64) += tests/vhost-user-test$(EXESUF) check-qtest-x86_64-$(CONFIG_VHOST_USER_NET_TEST_x86_64) += tests/vhost-user-test$(EXESUF)
endif endif
check-qtest-i386-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF) check-qtest-i386-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
check-qtest-i386-y += tests/test-filter-mirror$(EXESUF) check-qtest-i386-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
check-qtest-i386-y += tests/test-filter-redirector$(EXESUF) check-qtest-i386-$(CONFIG_POSIX) += tests/test-filter-redirector$(EXESUF)
check-qtest-i386-y += tests/postcopy-test$(EXESUF) check-qtest-i386-y += tests/postcopy-test$(EXESUF)
check-qtest-i386-y += tests/test-x86-cpuid-compat$(EXESUF) check-qtest-i386-y += tests/test-x86-cpuid-compat$(EXESUF)
check-qtest-i386-y += tests/numa-test$(EXESUF) check-qtest-i386-y += tests/numa-test$(EXESUF)
@ -325,8 +325,8 @@ check-qtest-ppc64-y += tests/usb-hcd-xhci-test$(EXESUF)
gcov-files-ppc64-y += hw/usb/hcd-xhci.c gcov-files-ppc64-y += hw/usb/hcd-xhci.c
check-qtest-ppc64-y += $(check-qtest-virtio-y) check-qtest-ppc64-y += $(check-qtest-virtio-y)
check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF) check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
check-qtest-ppc64-y += tests/test-filter-mirror$(EXESUF) check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
check-qtest-ppc64-y += tests/test-filter-redirector$(EXESUF) check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-redirector$(EXESUF)
check-qtest-ppc64-y += tests/display-vga-test$(EXESUF) check-qtest-ppc64-y += tests/display-vga-test$(EXESUF)
check-qtest-ppc64-y += tests/numa-test$(EXESUF) check-qtest-ppc64-y += tests/numa-test$(EXESUF)
check-qtest-ppc64-$(CONFIG_IVSHMEM) += tests/ivshmem-test$(EXESUF) check-qtest-ppc64-$(CONFIG_IVSHMEM) += tests/ivshmem-test$(EXESUF)

5
tests/test-filter-mirror.c
View File

@ -17,9 +17,6 @@
static void test_mirror(void) static void test_mirror(void)
{ {
#ifndef _WIN32
/* socketpair(PF_UNIX) which does not exist on windows */
int send_sock[2], recv_sock; int send_sock[2], recv_sock;
char *cmdline; char *cmdline;
uint32_t ret = 0, len = 0; uint32_t ret = 0, len = 0;
@ -74,8 +71,6 @@ static void test_mirror(void)
g_free(recv_buf); g_free(recv_buf);
close(recv_sock); close(recv_sock);
unlink(sock_path); unlink(sock_path);
#endif
} }
int main(int argc, char **argv) int main(int argc, char **argv)

10
tests/test-filter-redirector.c
View File

@ -59,9 +59,6 @@
static void test_redirector_tx(void) static void test_redirector_tx(void)
{ {
#ifndef _WIN32
/* socketpair(PF_UNIX) which does not exist on windows */
int backend_sock[2], recv_sock; int backend_sock[2], recv_sock;
char *cmdline; char *cmdline;
uint32_t ret = 0, len = 0; uint32_t ret = 0, len = 0;
@ -129,15 +126,10 @@ static void test_redirector_tx(void)
unlink(sock_path0); unlink(sock_path0);
unlink(sock_path1); unlink(sock_path1);
qtest_end(); qtest_end();
#endif
} }
static void test_redirector_rx(void) static void test_redirector_rx(void)
{ {
#ifndef _WIN32
/* socketpair(PF_UNIX) which does not exist on windows */
int backend_sock[2], send_sock; int backend_sock[2], send_sock;
char *cmdline; char *cmdline;
uint32_t ret = 0, len = 0; uint32_t ret = 0, len = 0;
@ -203,8 +195,6 @@ static void test_redirector_rx(void)
unlink(sock_path0); unlink(sock_path0);
unlink(sock_path1); unlink(sock_path1);
qtest_end(); qtest_end();
#endif
} }
int main(int argc, char **argv) int main(int argc, char **argv)