diff mbox

tests: re-enable vhost-user-test

Message ID 1444919965-4327-1-git-send-email-marcandre.lureau@redhat.com
State New
Headers show

Commit Message

Marc-André Lureau Oct. 15, 2015, 2:39 p.m. UTC 
From: Marc-André Lureau <marcandre.lureau@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.lureau@redhat.com>
---
 configure      | 1 +
 tests/Makefile | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

Comments

Michael S. Tsirkin Oct. 24, 2015, 7:44 p.m. UTC | #1 
On Thu, Oct 15, 2015 at 04:39:25PM +0200, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@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.lureau@redhat.com>

I had to drop this, this still seems to break on some configs.
Pls work to fix this up.

> ---
>  configure      | 1 +
>  tests/Makefile | 4 +---
>  2 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/configure b/configure
> index 7b5fcd2..8d9b83c 100755
> --- a/configure
> +++ b/configure
> @@ -5581,6 +5581,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 209eca9..518248a 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
> -- 
> 2.4.3
diff mbox

Patch

diff --git a/configure b/configure
index 7b5fcd2..8d9b83c 100755
--- a/configure
+++ b/configure
@@ -5581,6 +5581,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 209eca9..518248a 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