[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 04/25] tests: test-netfilter && pxe-test require sl
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 04/25] tests: test-netfilter && pxe-test require slirp |
Date: |
Mon, 31 Jul 2017 13:21:23 +0300 |
From: Marc-André Lureau <address@hidden>
If slirp is disabled, it will fail with:
qemu-system-x86_64: -netdev user,id=qtest-bn0: Parameter 'type' expects a
netdev backend type
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
tests/Makefile.include | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 7af278db55..98387d3a51 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -219,7 +219,7 @@ gcov-files-i386-y += hw/block/hd-geometry.c
check-qtest-i386-y += tests/boot-order-test$(EXESUF)
check-qtest-i386-y += tests/bios-tables-test$(EXESUF)
check-qtest-i386-y += tests/boot-serial-test$(EXESUF)
-check-qtest-i386-y += tests/pxe-test$(EXESUF)
+check-qtest-i386-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)
check-qtest-i386-y += tests/rtc-test$(EXESUF)
check-qtest-i386-y += tests/ipmi-kcs-test$(EXESUF)
check-qtest-i386-y += tests/ipmi-bt-test$(EXESUF)
@@ -259,7 +259,7 @@ check-qtest-i386-$(CONFIG_VHOST_NET_TEST_i386) +=
tests/vhost-user-test$(EXESUF)
ifeq ($(CONFIG_VHOST_NET_TEST_i386),)
check-qtest-x86_64-$(CONFIG_VHOST_NET_TEST_x86_64) +=
tests/vhost-user-test$(EXESUF)
endif
-check-qtest-i386-y += 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-y += tests/test-filter-redirector$(EXESUF)
check-qtest-i386-y += tests/postcopy-test$(EXESUF)
@@ -293,7 +293,7 @@ check-qtest-ppc64-y += tests/drive_del-test$(EXESUF)
check-qtest-ppc64-y += tests/postcopy-test$(EXESUF)
check-qtest-ppc64-y += tests/boot-serial-test$(EXESUF)
check-qtest-ppc64-y += tests/rtas-test$(EXESUF)
-check-qtest-ppc64-y += tests/pxe-test$(EXESUF)
+check-qtest-ppc64-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)
check-qtest-ppc64-y += tests/usb-hcd-ohci-test$(EXESUF)
gcov-files-ppc64-y += hw/usb/hcd-ohci.c
check-qtest-ppc64-y += tests/usb-hcd-uhci-test$(EXESUF)
@@ -301,7 +301,7 @@ gcov-files-ppc64-y += hw/usb/hcd-uhci.c
check-qtest-ppc64-y += tests/usb-hcd-xhci-test$(EXESUF)
gcov-files-ppc64-y += hw/usb/hcd-xhci.c
check-qtest-ppc64-y += $(check-qtest-virtio-y)
-check-qtest-ppc64-y += 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-y += tests/test-filter-redirector$(EXESUF)
check-qtest-ppc64-y += tests/display-vga-test$(EXESUF)
--
2.11.0
- [Qemu-trivial] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 06/25] qemu-system-tricore: segfault when entering "x 0" on the monitor, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 10/25] qcow2: fix null pointer dereference, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 09/25] ivshmem: fix incorrect error handling in ivshmem_recv_msg(), Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 02/25] fix qemu-system-unicore32 crashing when calling without -kernel, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 07/25] tests: add missing dependency to build QTEST_QEMU_BINARY, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 04/25] tests: test-netfilter && pxe-test require slirp,
Michael Tokarev <=
- [Qemu-trivial] [PULL 12/25] net/eth: fix incorrect check of iov_to_buf() return value, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 13/25] m68k/translate: fix incorrect copy/paste, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 16/25] syscall: fix use of uninitialized values, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 19/25] docs: fix broken paths to docs/interop dir, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 08/25] loader: check get_image_size() return value, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 18/25] thunk: assert nb_fields is valid, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 17/25] syscall: check inotify() and eventfd() return value, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 03/25] MAINTAINERS: Improve the NetBSD regex pattern, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 22/25] docs: fix broken paths to docs/devel/atomics.txt, Michael Tokarev, 2017/07/31
- [Qemu-trivial] [PULL 11/25] ui/vnc: fix leak of SocketAddress **, Michael Tokarev, 2017/07/31