On Wed, Oct 21, 2015 at 01:26:36PM +0300, Michael S. Tsirkin wrote: > From: Marc-André Lureau <marcandre.lur...@redhat.com> > > 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/64 softmmu specific test, in order > to enable it correctly, kvm & vhost-net are also conditions. To check > that, set CONFIG_VHOST_NET_TEST when kvm is also enabled. > > Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> > Reviewed-by: Michael S. Tsirkin <m...@redhat.com> > Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
I dropped this one since it still breaks on some setups. Marc-André, pls work to re-enable this upstream when you are back. > --- > configure | 1 + > tests/Makefile | 4 +--- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/configure b/configure > index f08327e..9eec860 100755 > --- a/configure > +++ b/configure > @@ -5562,6 +5562,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=y" >> $config_host_mak > fi > fi > esac > diff --git a/tests/Makefile b/tests/Makefile > index cb221de..d69e097 100644 > --- a/tests/Makefile > +++ b/tests/Makefile > @@ -191,9 +191,7 @@ 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) > -endif > +check-qtest-i386-$(CONFIG_VHOST_NET_TEST) += tests/vhost-user-test$(EXESUF) > check-qtest-i386-y += tests/test-netfilter$(EXESUF) > check-qtest-x86_64-y = $(check-qtest-i386-y) > gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c > -- > MST >
