From nobody Tue Feb 10 17:30:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552407379400677.5404743003345; Tue, 12 Mar 2019 09:16:19 -0700 (PDT) Received: from localhost ([127.0.0.1]:55184 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3k4c-00038h-O9 for importer@patchew.org; Tue, 12 Mar 2019 12:16:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3jtd-0001lI-IM for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:04:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3jok-0000Ij-F5 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 11:59:51 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:34600) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3jok-0000HI-7u for qemu-devel@nongnu.org; Tue, 12 Mar 2019 11:59:50 -0400 Received: by mail-wr1-x431.google.com with SMTP id f14so3331684wrg.1 for ; Tue, 12 Mar 2019 08:59:50 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o8sm4143677wma.1.2019.03.12.08.59.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 08:59:47 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6F3181FF89; Tue, 12 Mar 2019 15:59:47 +0000 (UTC) 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=mFOJ2Jxwbwpi84hQxobUMi9wk5PwjfEoN1ywOlS+e0ik9xeZbF4MB1XMepntH58XdA //pT5LThf5EbwoZGKXELaH9g5C5UjkQz5fq1p/p3/Qxaf6CrMePaqi50zw4UnL5WYZ/F lAclyGifcEM8Qa2jIGNq6G4i7bzNKfTPUTWHqbB94eJnKExtBNtz4qTvlSXh/Mj5Y1W8 PjTaHDFB3WmMrgbdm3zOK1hyrZw+IToYKKju36SBOucFDVQqabg3c+7SOKD4XtBMJb69 HXw8MEupVfBQwQ6SdQB3vvrj2Y31vdhmhaflqXoC00flAJZlDWoN3+89mZUSOPrwRFi8 lLHw== 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=iCeKTsndwQZqSgKqyeAnwXJs9ZgsEm0fLR3cmSdLTN0Mozie81PMR/sHHaFrvj97sz dRKnc+CDc2PpByFlqtyCnxZOtQKkPP33fqaxg+dDPjP3uOaly/pzff6TyDrfoMXyrdqr yWqq8mlQRiOabrPX8fLHPB+7dwyabAXyQuRMG9ZGBfgHPQtleOOHvuPPTySF8e5AgqIr SvQGLXx2v5Pz7iXZkCeulBqgLyBKace697pgDR8Ja8vhhWg6s8ercZoF8/qJPWkTFke4 nYaj4cOd8AlI1QICGv2gDveSHqAH/a5VrftRiMvnsanCTPP0L18LE+7oMZf5lYSTsrUO teVw== X-Gm-Message-State: APjAAAX+LC1keCMD+HnM8aqMKNpEU68L1yPCjhdh1a2rIN0WHF0Eebsg 4QriZpDtSPNcggpExmJ0Gx5CPg== X-Google-Smtp-Source: APXvYqxMseICFJL8yuQmHAIO3ZkuM/SL99uPn7utjBTlT8F3LRbtQCd8CFYU4Jc6gkDKlyME+rWnzQ== X-Received: by 2002:a5d:570a:: with SMTP id a10mr24861150wrv.85.1552406389063; Tue, 12 Mar 2019 08:59:49 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 15:59:27 +0000 Message-Id: <20190312155947.14918-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155947.14918-1-alex.bennee@linaro.org> References: <20190312155947.14918-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::431 Subject: [Qemu-devel] [PATCH v4 01/21] 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: peter.maydell@linaro.org, famz@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, agraf@suse.de, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson --- tests/tcg/Makefile | 17 ++++++++++++++++- tests/tcg/Makefile.include | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) 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=3Dslow 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|soft= mmu). # =20 -include ../../config-host.mak @@ -52,7 +52,11 @@ QEMU_CFLAGS=3D LDFLAGS=3D =20 # The QEMU for this TARGET +ifdef CONFIG_USER_ONLY QEMU=3D../qemu-$(TARGET_NAME) +else +QEMU=3D../qemu-system-$(TARGET_NAME) +endif =20 # If TCG debugging is enabled things are a lot slower ifeq ($(CONFIG_DEBUG_TCG),y) @@ -61,6 +65,7 @@ else TIMEOUT=3D15 endif =20 +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 =20 %: %.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 =20 all: $(TESTS) =20 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) =20 -run-guest-tests: guest-tests qemu-$(TARGET_NAME) +run-guest-tests: guest-tests qemu-$(subst y,system-,$(CONFIG_SOFTMMU))$(TA= RGET_NAME) $(call quiet-command, \ (cd tests && $(MAKE) -f $(TCG_MAKE) SPEED=3D$(SPEED) run), \ "RUN", "tests for $(TARGET_NAME)") --=20 2.20.1