From nobody Sat May 18 21:26:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615562469; cv=none; d=zohomail.com; s=zohoarc; b=k6P6WkAiRlnHlDVrQpBdc61F/pZ6LjzzSYZVbCdoIRSP7XMVHj0Gdv/IUt8xPwhbn3gPPauoJnTvA4Hwb82t4FM6g/gqXCRm1TYDzhxgZ39U7g2cl5sXKwetbuJgya0Ijj/ns7UzqITM4ktprlN8SzlirqxHiXdpeRugpZss5cg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615562469; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=3RKQma1l7Rl7FkdhJhcWopqorchNx7lcyhOmW3wkAf4=; b=HDjPIBPU1wiVSjzT6ocaEpSnwGg2i9y+KRksKUb83QK2ElvM3cSt+mTK9a18FBJKeliTWKDdkxZpxp5eQTZP2m9N0lsRdGs7xjzNCi3R4VSm4pGXUx+Ntkv6osyCQwaE9QzQRLfY+6CtjRhHSr8ECOc/elk6kL+VLSyLYnH6h3A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1615562469878763.1484362694266; Fri, 12 Mar 2021 07:21:09 -0800 (PST) Received: by mail-wr1-f51.google.com with SMTP id e9so1986877wrw.10 for ; Fri, 12 Mar 2021 07:21:09 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id j136sm2564398wmj.35.2021.03.12.07.21.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 07:21:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3RKQma1l7Rl7FkdhJhcWopqorchNx7lcyhOmW3wkAf4=; b=nhA60YIpoVF+gz95EPN2kVsbRQaMNm4hXqSo6dQjNtb8IyAXNgUqsQP63Z75dhTndg IjI3D/2NtBxAh9xbWvY/mmTU+0UWivD0VLDTBV67qlpslYSXJshB6i5ARwiutplmT7rs ZhVXib/F5jOrwIaeb+Ole/wgw24/hTFYGckvfvmVAGqzJdCFWArAWnZ5YrE3maVjK7wL zVw2uwCiJpyv0amnQgDVQQX+uZxO3pK4IC3ZKkIrqGe8e8Fv033tyrVO2GD3fcfo8HpH ksV/q549Xahjk77hpLDQbzrhCIpWTipfwcZhKPA7Nl8cAXtbmWn9VFRX6CsqNQi1YRRt q/Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=3RKQma1l7Rl7FkdhJhcWopqorchNx7lcyhOmW3wkAf4=; b=Nx4jVXGBD0WbLORfBy3m3OOQ3+uWzUkbz3spadyie1Kb3LWuetv2EzXWZKaxYpXq5O wE9o1RkzLhGNZcfkBz+K587+F8uoq8nddVt96qTn9cf+kyiUjBfhvaaYbqKyvep1f61T f1syqt+uC9ol3OeoX6WajPDmmZEhPOI/MswL3mtXGaw0zpdsb40YXNRbK8h2Hx7yxZDS j0+v9bbDOMXdhXPz9Ztz3Zk9WpSQZ9R5ec2kbM87skpLnxDcV/rqj1gk9p9/657Hqbup aCDvSjRU0AQZSqymk8m3XSWcFEnKP9X4VzE3DkMPXK/S8qb48ricE3wmewmeReDSOBAc RViA== X-Gm-Message-State: AOAM531chY5cQdjnaieXuLtRG8H+/tKmNueJF2kmFuG9C410yifIQMre f/C/6CssNlXQ73PQGC69DFI= X-Google-Smtp-Source: ABdhPJxyAcH7zlQqvHiuAcWnT7QZwfvFe0aqG5jkm9F08OT5NmETWiwjV0dzMK3ajWjU7jTkxGeomA== X-Received: by 2002:a5d:640b:: with SMTP id z11mr14169105wru.327.1615562468097; Fri, 12 Mar 2021 07:21:08 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Paolo Bonzini Subject: [PATCH] tests/tcg: Run tests on arch variants again Date: Fri, 12 Mar 2021 16:21:05 +0100 Message-Id: <20210312152105.1836543-1-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) We used to run the TCG tests for various QEMU targets, but at some points it got restricted to base directories in tests/tcg/. For example, armeb/mipsel/mips64/... targets are currently skipped. The configuration Makefiles in default-configs/targets/ provide all the required information, in particular TARGET_BASE_ARCH. Source the target default-configs.mak and optionally process the TARGET_ARCH / TARGET_BASE_ARCH Makefiles (if these variables differ from TARGET_NAME). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/tcg/Makefile.target | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 24d75a5801f..677b247328f 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -85,6 +85,10 @@ TIMEOUT=3D15 endif =20 ifdef CONFIG_USER_ONLY + +# FIXME bsd-user? +include $(SRC_PATH)/default-configs/targets/$(TARGET_NAME)-linux-user.mak + # The order we include is important. We include multiarch first and # then the target. If there are common tests shared between # sub-targets (e.g. ARM & AArch64) then it is up to @@ -92,6 +96,16 @@ ifdef CONFIG_USER_ONLY # architecture in its VPATH. -include $(SRC_PATH)/tests/tcg/multiarch/Makefile.target -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.target +ifneq ($(TARGET_ARCH),) +ifneq ($(TARGET_ARCH),$(TARGET_NAME)) +-include $(SRC_PATH)/tests/tcg/$(TARGET_ARCH)/Makefile.target +endif +endif +ifneq ($(TARGET_BASE_ARCH),) +ifneq ($(TARGET_BASE_ARCH),$(TARGET_ARCH)) +-include $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.target +endif +endif =20 # Add the common build options CFLAGS+=3D-Wall -Werror -O0 -g -fno-strict-aliasing @@ -102,12 +116,25 @@ endif %: %.c $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) else + +include $(SRC_PATH)/default-configs/targets/$(TARGET_NAME)-softmmu.mak + # 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/minilib/Makefile.target -include $(SRC_PATH)/tests/tcg/multiarch/system/Makefile.softmmu-target -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.softmmu-target +ifneq ($(TARGET_ARCH),) +ifneq ($(TARGET_ARCH),$(TARGET_NAME)) +-include $(SRC_PATH)/tests/tcg/$(TARGET_ARCH)/Makefile.softmmu-target +endif +endif +ifneq ($(TARGET_BASE_ARCH),) +ifneq ($(TARGET_BASE_ARCH),$(TARGET_ARCH)) +-include $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.softmmu-target +endif +endif =20 endif =20 --=20 2.26.2