From patchwork Thu Feb 28 20:25:22 2019 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: 159432 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp1087807jad; Thu, 28 Feb 2019 12:28:46 -0800 (PST) X-Google-Smtp-Source: APXvYqxs1zMlWTXXwK9xjzBu82eNGV9kokPGCzeceV+v98vrLJ0SwAyAJ7Os0bxsyLRSf05dJCEK X-Received: by 2002:a81:9383:: with SMTP id k125mr693452ywg.323.1551385725959; Thu, 28 Feb 2019 12:28:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551385725; cv=none; d=google.com; s=arc-20160816; b=vGSQOVveeNQy4rCgkIUKpbb0BD5WiT1BFov/uaes6l+Uo2di8YjBhXgaOewZKG34Fe I+aP1gW4t080ZJyZZ3y2C+WfK075b+HdTnY6G9h4AcbjXqu7XyeGO8twRznihKYnucTb NOYTlQ4nxuwPDA48AYgwK3Ob/beijgtDEWZ0v2UPSJhE2jRmnS8Ud2S5VHsMy1lxuieD W8kEOuYULixv8t+IfEkuhNcYkTCI8CWwO2afGyql9yZLnbupQvEHGPb7c5+/ae+5xQVp i3katQWvdqDWM96xs8JB1Usr4IjhL7mQMZ42KepxL//VqC/dn594A0Gf+EEvf6BIS/y+ UgFg== 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=L/z9MUE3cOCWWFeNa1MNv0jMC1VzRLWSs++imNZ+SgY=; b=juowj+/+YRFhFab2u2TRzsgIABDkgVEHSPjd9JqZ8Z8KjHU+fgnJ5g8QOHPcj8/FE2 g0sw33RJrx12SVcZxxVAs6MoH3slHYAlJIx+rwxHtmzL+ge6Chd5QiUwPs6AcGTJzYYn jGoIOvFONco4+OgAAJ7eLd1VXGww0v9hR8rKuLvIN+6r8+Mnferz1xpUnvB56mTy8zp0 XRB9Rpt5vRoG//ie827msgN/sFOin7lqSXkv/+T4zo2lbGNHR4ved1plmb25kyA3GvOk IaUiUqOzEt5DOS2Dyh1NJgCmLbGppTcqLW44PAsYdfRFl5cu+n873xtKNUyJwZXALYLT kUWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VSILV4X+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id f184si10998644ywb.219.2019.02.28.12.28.45 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 28 Feb 2019 12:28:45 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VSILV4X+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:45989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSIP-0001ic-CA for patch@linaro.org; Thu, 28 Feb 2019 15:28:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42480) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSFR-0000QH-Ux for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzSFR-00077u-49 for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:41 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:42250) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzSFQ-000753-T6 for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:41 -0500 Received: by mail-wr1-x444.google.com with SMTP id r5so23418855wrg.9 for ; Thu, 28 Feb 2019 12:25:40 -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=L/z9MUE3cOCWWFeNa1MNv0jMC1VzRLWSs++imNZ+SgY=; b=VSILV4X+ptYsYQRPok9hn3I5BYN5GCJTag/FZhROolS9/FbcaHrD0usvZlAjrX+Jr7 SESQ8sTDiy+C+3Pr6f2KDmPgis5TKABsFqt19PH0Itb5+4xRdrzCEr81zzIICEO+Yrw3 GXl95bQPlvYL5+mRKFo8+zsx5PmIfYEL37oVE4/HE0/wawuFF/2D7FtPJTJtYYd1Ez91 xX3uHUuP05i0QWvKDOPDEGhcDFAhzyGEQ1IFNLePPC5C1C+HmHc8xMQEI4nVEkb5LKey uXj6vz84YCGI/n2j0GOfHU2YKRaVKvoencYSF9vHsZY8bqYMWrttNyf0IfDLxeKg71Km 66mw== 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=L/z9MUE3cOCWWFeNa1MNv0jMC1VzRLWSs++imNZ+SgY=; b=G/tNRQIsSEmoU3JvN1iI1SuTqZ5mHkGCchfyxGtDoPLUr/onGUpWNBQB4rTsyIIQnO hQ1DaJU1MgTDcnoajC4/cz0+LqtcoSMbjCg/plZkbul8T9lyRPN+WaQbdtZuqWs6V4Vy 3HsAy1ZNwFm5A0wbSkwdEslZ3pPQkaJdBl4GEUtUJIaz/Ib//zKy0eQr94hbpr0eO5js rPRSqx+WzZgI+ubtMKT2aws2On/HWV01HMhG50icws5p0F/8t2besWuJifiTU5E7lZcH TXaI9PAtS2VF+ggqU2lW2UcuWu8U4BpCk1bQBMuOVVmCmKBSS9DxFIhfrn360KrKDOdC nskA== X-Gm-Message-State: APjAAAUQTGFLsStp7/rbLrir7N1MkeyZ2VqSSw8Yj9SDbSU7zxsrQzoQ h65upP7tdTZCqnhHu1TbFbc6so2aCwU= X-Received: by 2002:a5d:5504:: with SMTP id b4mr791414wrv.291.1551385539352; Thu, 28 Feb 2019 12:25:39 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id m189sm6380630wmf.7.2019.02.28.12.25.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 12:25:37 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6E9F61FF82; Thu, 28 Feb 2019 20:25:37 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2019 20:25:22 +0000 Message-Id: <20190228202537.4638-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190228202537.4638-1-alex.bennee@linaro.org> References: <20190228202537.4638-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::444 Subject: [Qemu-devel] [PATCH v2 01/16] 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: edgar.iglesias@gmail.com, Richard Henderson , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , jcmvbkbc@gmail.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- tests/tcg/Makefile | 17 ++++++++++++++++- tests/tcg/Makefile.include | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile index bf06415390..55feab0f67 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 include 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)")