diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2015-10-26 15:32:00 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-11-19 15:26:05 +0200 |
| commit | 421f4448cec3e42f8477499c5c584699e2cf656b (patch) | |
| tree | 9f68c43a41e752fc5cd2cf3011ecfa595fc09c04 | |
| parent | d9a3b33d2c9f996537b7f1d0246dee2d0120cefb (diff) | |
| download | qemu-421f4448cec3e42f8477499c5c584699e2cf656b.zip qemu-421f4448cec3e42f8477499c5c584699e2cf656b.tar.gz qemu-421f4448cec3e42f8477499c5c584699e2cf656b.tar.bz2 | |
tests: re-enable vhost-user-test
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 <marcandre.lureau@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | tests/Makefile | 5 |
2 files changed, 4 insertions, 2 deletions
@@ -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) |