From patchwork Mon Dec 10 15:28:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 153277 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3687506ljp; Mon, 10 Dec 2018 07:31:22 -0800 (PST) X-Google-Smtp-Source: AFSGD/VjvJU3FnKsBPBBHEteJkPxSz9mryJAH8BJG4Df8Dg2Sgz3pNq4+XD8SB8YB7HuOk0B9y9q X-Received: by 2002:aed:3b25:: with SMTP id p34mr12223630qte.310.1544455882572; Mon, 10 Dec 2018 07:31:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544455882; cv=none; d=google.com; s=arc-20160816; b=d5yNsr8+LcgO6BxPev82g26UA3rBESODfjhOo1y/XiZvdF7jjMsqy1zaUksZPfEOdC MUcy952aShNdzaX4B80YuhBHy9+7B2Fa6/Pwwxir9Wmbll5TJv3NZpmLpbre+KEPPGMW ziWR1YECUHYPkvCeC4IrqnOQpNIDyb4GCNYii7LB3sXhsnpzTi29oSa42rxx699i2Z5u /4lbcBNXd7TwDVcj/eS2T1prfdEjrrASBcawFTWIbOKm40oN+LsKl/dVXDCOAwHl4iY/ tY4JH7DvfLd8JR9CPS7G0XHDOD4xng5dqcMqZLPtuVaz2T6TLi9UiFZ6zZPlWYBk5hfK LzcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=Vsx0jO1mCGik2DFwM4+5uQ3LUPH/aVuR7GzWYdPcUDs=; b=adYxZ94K8NzBBJDfCD9mgKtCNRmfl24oYisYOA/jbdS2pNi3VHNTRRNEVjFXp8thYG 9pHAKFZvsdOM/KMshxcObU7zEATu55ojDljBYU36EXjYeGyh40hWwjv9YJRA0ISE0J3I IhUIAMUfMDwA/cAqQmwxvdnefOsHsqscESOKiReQ0f3yMIgCdZTbrAEPrx2Ss/aAz+7A u9Rn9O8wW3iiU/gACP0h76UZNsxENCoRIASWH5mYcNAVlYAEOydaszavO0vajhTyH7fo G7rfmlXcxb1Fxm83Ht2kEASxFzoB/uPTMt/+CX9xyzT7aocV/7Uz0PRsvfj6PLTl3ztE vQiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=U6E+M+RU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u24si6837509qtc.86.2018.12.10.07.31.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 10 Dec 2018 07:31:22 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=U6E+M+RU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33335 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNWj-0000ws-RP for patch@linaro.org; Mon, 10 Dec 2018 10:31:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43240) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNU3-000858-Q9 for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWNU2-0000UL-Ct for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:35 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:51365) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gWNU2-0000UB-6J for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:34 -0500 Received: by mail-wm1-x341.google.com with SMTP id s14so11410756wmh.1 for ; Mon, 10 Dec 2018 07:28:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Vsx0jO1mCGik2DFwM4+5uQ3LUPH/aVuR7GzWYdPcUDs=; b=U6E+M+RUiVVdAFrQWz83RBmzJUzpZOnA+cuTy3zSbSytZj+AeMERX6rLuMZTd7z1zj xslHanfDYbV3n/OjrujFhKNmkamg4k3ZJFcy0jFefKejWyZjI2ocLpAZubsuGAFn/Qm4 fZfSJiIZoGM9N8u4VoPLU6ZgbU0jzSUfq68ZI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Vsx0jO1mCGik2DFwM4+5uQ3LUPH/aVuR7GzWYdPcUDs=; b=U4P7X1MO4eczVzWSptuWc9QBUO+lltgD0qm44veuXjJgQ8VEnCr6KhFl5lh34Ai7S0 4hqDtdRsUsCuooJc4oz/HGVVjZArSBft18XbHDcQ2eeHVtBRUV1akf8Sppt+GBPUfRqP bOwSy6gvFSrQhXnX6iQ1FwfbfAbOh3X5YX69uK+nTJHcgsn+G9fD+4pmv6RbSCeu1Por iidIqdS0FZ1pQTynPH+S8K9E1l7wcbQmcTKuHtWoqMNB0GNKQUHvPbeoHJ+O+9088EpP NsKXS8uuzeiEgKojHle+wHmNHm0cGcjoWs3lO50MJF6pjQTlhzZ/rx4rGI63izaCTqZV Nvhg== X-Gm-Message-State: AA+aEWaCSeXlIQ5KrkSEO/m9lqrq69ziUamU3EyJZpIBaueiyqFtoTuI NcutQ86qKt1OD+umWnjkT2t+9g== X-Received: by 2002:a1c:30b:: with SMTP id 11mr5214998wmd.110.1544455713161; Mon, 10 Dec 2018 07:28:33 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id p5sm9692759wmh.16.2018.12.10.07.28.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Dec 2018 07:28:31 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id DF7023E0568; Mon, 10 Dec 2018 15:28:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Mon, 10 Dec 2018 15:28:17 +0000 Message-Id: <20181210152829.29271-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181210152829.29271-1-alex.bennee@linaro.org> References: <20181210152829.29271-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [RFC PATCH 01/13] tests/tcg: add softmmu awareness to Makefile X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , jcmvbkbc@gmail.com, michael@walle.cc, amarkovic@wavecomp.com, edgar.iglesias@gmail.com, shorne@gmail.com, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée --- tests/tcg/Makefile | 17 ++++++++++++++++- tests/tcg/Makefile.include | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) -- 2.17.1 Reviewed-by: Richard Henderson diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile index bf06415390..d6a7fee2e7 100644 --- a/tests/tcg/Makefile +++ b/tests/tcg/Makefile @@ -26,7 +26,7 @@ # # We also accept SPEED=slow to enable slower running tests # -# We also expect to be in the tests build dir for the FOO-linux-user. +# We also expect to be in the tests build dir for the FOO-(linux-user|softmmu). # -include ../../config-host.mak @@ -52,7 +52,11 @@ QEMU_CFLAGS= LDFLAGS= # The QEMU for this TARGET +ifdef CONFIG_USER_ONLY QEMU=../qemu-$(TARGET_NAME) +else +QEMU=../qemu-system-$(TARGET_NAME) +endif # If TCG debugging is enabled things are a lot slower ifeq ($(CONFIG_DEBUG_TCG),y) @@ -61,6 +65,7 @@ else TIMEOUT=15 endif +ifdef CONFIG_USER_ONLY # The order we include is important. We include multiarch, base arch # and finally arch if it's not the same as base arch. -include $(SRC_PATH)/tests/tcg/multiarch/Makefile.target @@ -77,6 +82,16 @@ endif %: %.c $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) +else +# For softmmu targets we inculde a different Makefile fragement as the +# build options for bare programs are usually pretty different. They +# are expected to provide their own build recipes. +-include $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.softmmu-target +ifneq ($(TARGET_BASE_ARCH),$(TARGET_NAME)) +-include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.softmmu-target +endif + +endif all: $(TESTS) diff --git a/tests/tcg/Makefile.include b/tests/tcg/Makefile.include index c581bd6ffc..73b5626fc5 100644 --- a/tests/tcg/Makefile.include +++ b/tests/tcg/Makefile.include @@ -67,7 +67,7 @@ endif ifneq ($(GUEST_BUILD),) guest-tests: $(GUEST_BUILD) -run-guest-tests: guest-tests qemu-$(TARGET_NAME) +run-guest-tests: guest-tests qemu-$(subst y,system-,$(CONFIG_SOFTMMU))$(TARGET_NAME) $(call quiet-command, \ (cd tests && $(MAKE) -f $(TCG_MAKE) SPEED=$(SPEED) run), \ "RUN", "tests for $(TARGET_NAME)")