From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33888) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zmjgt-0006gP-DJ for qemu-devel@nongnu.org; Thu, 15 Oct 2015 10:39:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zmjgp-0001cN-C3 for qemu-devel@nongnu.org; Thu, 15 Oct 2015 10:39:35 -0400 Received: from mail-pa0-x234.google.com ([2607:f8b0:400e:c03::234]:32792) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zmjgp-0001c2-6t for qemu-devel@nongnu.org; Thu, 15 Oct 2015 10:39:31 -0400 Received: by pabrc13 with SMTP id rc13so89805428pab.0 for ; Thu, 15 Oct 2015 07:39:30 -0700 (PDT) Sender: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= From: marcandre.lureau@redhat.com Date: Thu, 15 Oct 2015 16:39:25 +0200 Message-Id: <1444919965-4327-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH] tests: re-enable vhost-user-test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , mst@redhat.com From: Marc-André Lureau 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 --- 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