From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XXFVR-0000FY-6e for qemu-devel@nongnu.org; Thu, 25 Sep 2014 16:19:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XXFVK-0004uv-P5 for qemu-devel@nongnu.org; Thu, 25 Sep 2014 16:19:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37234) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XXFVK-0004ta-CP for qemu-devel@nongnu.org; Thu, 25 Sep 2014 16:19:06 -0400 From: Eduardo Habkost Date: Thu, 25 Sep 2014 17:18:25 -0300 Message-Id: <1411676309-20218-7-git-send-email-ehabkost@redhat.com> In-Reply-To: <1411676309-20218-1-git-send-email-ehabkost@redhat.com> References: <1411676309-20218-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC 06/10] tests: Make test-x86-cpuid target-specific List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paolo Bonzini Instead of using a test-specific hack to add -I$(SRC_PATH)/target-i386, add test-x86-cpuid to $(test-obj-x86_64-softmmu-y). Signed-off-by: Eduardo Habkost --- tests/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 95566d9..f1d9907 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -45,7 +45,7 @@ check-unit-y += tests/test-thread-pool$(EXESUF) gcov-files-test-thread-pool-y = thread-pool.c gcov-files-test-hbitmap-y = util/hbitmap.c check-unit-y += tests/test-hbitmap$(EXESUF) -check-unit-y += tests/test-x86-cpuid$(EXESUF) +check-unit-x86_64-softmmu-y += tests/test-x86-cpuid$(EXESUF) # all code tested by test-x86-cpuid is inside topology.h gcov-files-test-x86-cpuid-y = check-unit-y += tests/test-xbzrle$(EXESUF) @@ -223,6 +223,8 @@ test-obj-y = tests/check-qint.o tests/check-qstring.o tests/check-qdict.o \ tests/test-x86-cpuid.o tests/test-mul64.o tests/test-int128.o \ tests/test-opts-visitor.o tests/test-qmp-event.o +test-obj-x86_64-softmmu-y = tests/test-x86-cpuid.o + test-qapi-obj-y = tests/test-qapi-visit.o tests/test-qapi-types.o \ tests/test-qapi-event.o @@ -230,8 +232,6 @@ $(test-obj-y): QEMU_INCLUDES += -Itests QEMU_CFLAGS += -I$(SRC_PATH)/tests qom-core-obj = qom/object.o qom/qom-qobject.o qom/container.o -tests/test-x86-cpuid.o: QEMU_INCLUDES += -I$(SRC_PATH)/target-i386 - tests/check-qint$(EXESUF): tests/check-qint.o libqemuutil.a tests/check-qstring$(EXESUF): tests/check-qstring.o libqemuutil.a tests/check-qdict$(EXESUF): tests/check-qdict.o libqemuutil.a -- 1.9.3