Commit 421f4448 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Michael S. Tsirkin
Browse files

tests: re-enable vhost-user-test 



Commit 7fe34ca9 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: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent d9a3b33d

configure

+1 −0
Original line number Diff line number Diff line
@@ -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

tests/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -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)