[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/15] tests: re-enable vhost-user-test
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 14/15] tests: re-enable vhost-user-test |
Date: |
Thu, 19 Nov 2015 15:36:42 +0200 |
From: Marc-André Lureau <address@hidden>
Commit 7fe34ca9c2e actually disabled vhost-user-test altogether,
since CONFIG_VHOST_NET is a per-target config variable.
tests/vhost-user-test is already x86/x64 softmmu specific test, in order
to enable it correctly, kvm & vhost-net are also conditions. To check
that, set CONFIG_VHOST_NET_TEST_$target when kvm is also enabled.
Since "check-qtest-x86_64-y = $(check-qtest-i386-y)", avoid duplication
when both x86 & x64 are enabled.
Other targets than x86 aren't enabled yet, and is intentionally left as
a future improvement, since I can't easily test those.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
configure | 1 +
tests/Makefile | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index f75df4b..0866bd8 100755
--- a/configure
+++ b/configure
@@ -5663,6 +5663,7 @@ case "$target_name" in
echo "CONFIG_KVM=y" >> $config_target_mak
if test "$vhost_net" = "yes" ; then
echo "CONFIG_VHOST_NET=y" >> $config_target_mak
+ echo "CONFIG_VHOST_NET_TEST_$target_name=y" >> $config_host_mak
fi
fi
esac
diff --git a/tests/Makefile b/tests/Makefile
index 90c4141..b937984 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -197,8 +197,9 @@ gcov-files-i386-y += hw/usb/hcd-xhci.c
check-qtest-i386-y += tests/pc-cpu-test$(EXESUF)
check-qtest-i386-y += tests/q35-test$(EXESUF)
gcov-files-i386-y += hw/pci-host/q35.c
-ifeq ($(CONFIG_VHOST_NET),y)
-check-qtest-i386-$(CONFIG_LINUX) += tests/vhost-user-test$(EXESUF)
+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-x86_64-y = $(check-qtest-i386-y)
--
MST
- Re: [Qemu-devel] [PULL 08/15] i440fx: print an error message if user tries to enable iommu, (continued)
[Qemu-devel] [PULL 05/15] vhost-user: print original request on error, Michael S. Tsirkin, 2015/11/19
[Qemu-devel] [PULL 09/15] tests/vhost-user-bridge: implement logging of dirty pages, Michael S. Tsirkin, 2015/11/19
[Qemu-devel] [PULL 11/15] vhost-user: ignore qemu-only features, Michael S. Tsirkin, 2015/11/19
[Qemu-devel] [PULL 10/15] specs/vhost-user: fix spec to match reality, Michael S. Tsirkin, 2015/11/19
[Qemu-devel] [PULL 12/15] vhost-user: fix log size, Michael S. Tsirkin, 2015/11/19
[Qemu-devel] [PULL 13/15] acpi: fix buffer overrun on migration, Michael S. Tsirkin, 2015/11/19
[Qemu-devel] [PULL 14/15] tests: re-enable vhost-user-test,
Michael S. Tsirkin <=
[Qemu-devel] [PULL 15/15] exec: silence hugetlbfs warning under qtest, Michael S. Tsirkin, 2015/11/19
Re: [Qemu-devel] [PULL 00/15] vhost, pc: fixes for 2.5, Peter Maydell, 2015/11/19
Re: [Qemu-devel] [PULL 00/15] vhost, pc: fixes for 2.5, Peter Maydell, 2015/11/26