From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56593) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zq4jl-0000xO-T5 for qemu-devel@nongnu.org; Sat, 24 Oct 2015 15:44:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zq4ji-0002Pp-Mx for qemu-devel@nongnu.org; Sat, 24 Oct 2015 15:44:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44051) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zq4ji-0002Pk-Hn for qemu-devel@nongnu.org; Sat, 24 Oct 2015 15:44:18 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 2C68D8E70E for ; Sat, 24 Oct 2015 19:44:18 +0000 (UTC) Date: Sat, 24 Oct 2015 22:44:15 +0300 From: "Michael S. Tsirkin" Message-ID: <20151024224257-mutt-send-email-mst@redhat.com> References: <1444919965-4327-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1444919965-4327-1-git-send-email-marcandre.lureau@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] tests: re-enable vhost-user-test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: marcandre.lureau@redhat.com Cc: qemu-devel@nongnu.org On Thu, Oct 15, 2015 at 04:39:25PM +0200, marcandre.lureau@redhat.com wro= te: > From: Marc-Andr=E9 Lureau >=20 > Commit 7fe34ca9c2e actually disabled vhost-user-test altogether, > since CONFIG_VHOST_NET is a per-target config variable. >=20 > 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. >=20 > Signed-off-by: Marc-Andr=E9 Lureau 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(-) >=20 > 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=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 209eca9..518248a 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$(= EXESUF) > 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 > 2.4.3