From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48313) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnMxG-0000Zb-Ma for qemu-devel@nongnu.org; Wed, 08 Aug 2018 07:48:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnMxF-00086Y-6S for qemu-devel@nongnu.org; Wed, 08 Aug 2018 07:48:42 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:45000 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fnMxF-000860-2J for qemu-devel@nongnu.org; Wed, 08 Aug 2018 07:48:41 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 91A5981663CF for ; Wed, 8 Aug 2018 11:48:40 +0000 (UTC) From: Juan Quintela Date: Wed, 8 Aug 2018 13:48:11 +0200 Message-Id: <20180808114830.7169-4-quintela@redhat.com> In-Reply-To: <20180808114830.7169-1-quintela@redhat.com> References: <20180808114830.7169-1-quintela@redhat.com> Subject: [Qemu-devel] [PATCH v2 03/22] check: Use land/lor when possible List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: dgilbert@redhat.com, lvivier@redhat.com, peterx@redhat.com So everythig is (a bit) more consistent Signed-off-by: Juan Quintela --- tests/Makefile.include | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index d6f5cc9ccc..2016c353e3 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -98,11 +98,9 @@ check-unit-y += tests/test-block-backend$(EXESUF) check-unit-y += tests/test-x86-cpuid$(EXESUF) # all code tested by test-x86-cpuid is inside topology.h gcov-files-test-x86-cpuid-y = -ifeq ($(CONFIG_SOFTMMU),y) -check-unit-y += tests/test-xbzrle$(EXESUF) -gcov-files-test-xbzrle-y = migration/xbzrle.c -check-unit-$(CONFIG_POSIX) += tests/test-vmstate$(EXESUF) -endif +check-unit-$(CONFIG_SOFTMMU) += tests/test-xbzrle$(EXESUF) +gcov-files-test-xbzrle-$(CONFIG_SOFTMMU) = migration/xbzrle.c +check-unit-$(call land, $(CONFIG_SOFTMMU), $(CONFIG_POSIX)) += tests/test-vmstate$(EXESUF) check-unit-y += tests/test-cutils$(EXESUF) gcov-files-test-cutils-y += util/cutils.c check-unit-y += tests/test-shift128$(EXESUF) @@ -299,9 +297,7 @@ check-qtest-i386-y += tests/q35-test$(EXESUF) check-qtest-i386-y += tests/vmgenid-test$(EXESUF) gcov-files-i386-y += hw/pci-host/q35.c check-qtest-i386-$(CONFIG_VHOST_USER_NET_TEST_i386) += tests/vhost-user-test$(EXESUF) -ifeq ($(CONFIG_VHOST_USER_NET_TEST_i386),) -check-qtest-x86_64-$(CONFIG_VHOST_USER_NET_TEST_x86_64) += tests/vhost-user-test$(EXESUF) -endif +check-qtest-x86_64-$(call lor, $(CONFIG_VHOST_USER_NET_TEST_i386), $(CONFIG_VHOST_USER_NET_TEST_x86_64)) += tests/vhost-user-test$(EXESUF) check-qtest-i386-$(CONFIG_TPM) += tests/tpm-crb-swtpm-test$(EXESUF) check-qtest-i386-$(CONFIG_TPM) += tests/tpm-crb-test$(EXESUF) check-qtest-i386-$(CONFIG_TPM) += tests/tpm-tis-swtpm-test$(EXESUF) -- 2.17.1