From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34557) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zoqbc-0004Bc-JU for qemu-devel@nongnu.org; Wed, 21 Oct 2015 06:26:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZoqbT-00062X-IG for qemu-devel@nongnu.org; Wed, 21 Oct 2015 06:26:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46864) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZoqbT-00062N-BX for qemu-devel@nongnu.org; Wed, 21 Oct 2015 06:26:43 -0400 Date: Wed, 21 Oct 2015 13:26:36 +0300 From: "Michael S. Tsirkin" Message-ID: <1445423133-5119-5-git-send-email-mst@redhat.com> References: <1445423133-5119-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1445423133-5119-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 04/38] tests: re-enable vhost-user-test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Michael Tokarev , Markus Armbruster , Gerd Hoffmann , Stefan Hajnoczi , =?us-ascii?B?PT9VVEYtOD9xP01hcmMtQW5kcj1DMz1BOT0yMEx1cmVhdT89?= , Paolo Bonzini From: Marc-Andr=E9 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=E9 Lureau Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- 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=3Dy" >> $config_target_mak if test "$vhost_net" =3D "yes" ; then echo "CONFIG_VHOST_NET=3Dy" >> $config_target_mak + echo "CONFIG_VHOST_NET_TEST=3Dy" >> $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 +=3D hw/usb/hcd-xhci.c check-qtest-i386-y +=3D tests/pc-cpu-test$(EXESUF) check-qtest-i386-y +=3D tests/q35-test$(EXESUF) gcov-files-i386-y +=3D hw/pci-host/q35.c -ifeq ($(CONFIG_VHOST_NET),y) -check-qtest-i386-$(CONFIG_LINUX) +=3D tests/vhost-user-test$(EXESUF) -endif +check-qtest-i386-$(CONFIG_VHOST_NET_TEST) +=3D tests/vhost-user-test$(EX= ESUF) check-qtest-i386-y +=3D tests/test-netfilter$(EXESUF) check-qtest-x86_64-y =3D $(check-qtest-i386-y) gcov-files-i386-y +=3D i386-softmmu/hw/timer/mc146818rtc.c --=20 MST