From nobody Tue Feb 10 01:15:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1544455840780676.460863670905; Mon, 10 Dec 2018 07:30:40 -0800 (PST) Received: from localhost ([::1]:33335 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNVp-0000ws-Up for importer@patchew.org; Mon, 10 Dec 2018 10:30:26 -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) 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) 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-Google-Smtp-Source: AFSGD/X7BlUEbRf9kXRaTtcXlkHhZbzSXOfw3sQYDAMDOciUbqJyDkof7boVmf1eMiB8mSQQk7XPPQ== X-Received: by 2002:a1c:30b:: with SMTP id 11mr5214998wmd.110.1544455713161; Mon, 10 Dec 2018 07:28:33 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=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 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::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=20Mathieu-Daud=C3=A9?= , jcmvbkbc@gmail.com, michael@walle.cc, amarkovic@wavecomp.com, edgar.iglesias@gmail.com, shorne@gmail.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , 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..d6a7fee2e7 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 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 =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.17.1