From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZyNVP-0002pX-Qv for qemu-devel@nongnu.org; Mon, 16 Nov 2015 12:23:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZyNVL-00084R-Rh for qemu-devel@nongnu.org; Mon, 16 Nov 2015 12:23:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52446) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZyNVL-00084L-Md for qemu-devel@nongnu.org; Mon, 16 Nov 2015 12:23:47 -0500 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 5AF3EAAA for ; Mon, 16 Nov 2015 17:23:47 +0000 (UTC) From: marcandre.lureau@redhat.com Date: Mon, 16 Nov 2015 18:23:37 +0100 Message-Id: <1447694618-17177-2-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1447694618-17177-1-git-send-email-marcandre.lureau@redhat.com> References: <1447694618-17177-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 2/3] 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=C3=A9 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/x64 softmmu specific test, in order to enable it correctly, kvm & vhost-net are also conditions. To check that, set CONFIG_VHOST_NET_TEST_$target when kvm is also enabled. Since "check-qtest-x86_64-y =3D $(check-qtest-i386-y)", avoid duplication when both x86 & x64 are enabled. Other targets than x86 aren't enabled yet, and is intentionally left as a future improvement, since I can't easily test those. Signed-off-by: Marc-Andr=C3=A9 Lureau --- configure | 1 + tests/Makefile | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure b/configure index f75df4b..0866bd8 100755 --- a/configure +++ b/configure @@ -5663,6 +5663,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_$target_name=3Dy" >> $config_host_ma= k fi fi esac diff --git a/tests/Makefile b/tests/Makefile index c1e3353..002881a 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -197,11 +197,12 @@ 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_i386) +=3D tests/vhost-user-tes= t$(EXESUF) check-qtest-i386-y +=3D tests/test-netfilter$(EXESUF) check-qtest-x86_64-y =3D $(check-qtest-i386-y) +ifeq ($(CONFIG_VHOST_NET_TEST_i386),) +check-qtest-x86_64-$(CONFIG_VHOST_NET_TEST_x86_64) +=3D tests/vhost-user= -test$(EXESUF) +endif gcov-files-i386-y +=3D i386-softmmu/hw/timer/mc146818rtc.c gcov-files-x86_64-y =3D $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-fil= es-i386-y)) check-qtest-mips-y =3D tests/endianness-test$(EXESUF) --=20 2.5.0