From patchwork Wed Jun 1 18:05:08 2022 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: 577802 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8f0c:0:0:0:0 with SMTP id mq12csp841588mab; Wed, 1 Jun 2022 11:09:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqXA3COI7duG61mz4OhPO34+KvXFUcRUW856sNABsDRQmRnMB0UP+a/soJuqORdhzm6PGR X-Received: by 2002:a05:620a:e0f:b0:6a5:e7fb:5d74 with SMTP id y15-20020a05620a0e0f00b006a5e7fb5d74mr868969qkm.46.1654106983589; Wed, 01 Jun 2022 11:09:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654106983; cv=none; d=google.com; s=arc-20160816; b=imJnOH+h5bCuTY6yBZP68E8j6DaqT6xAh9GhoRnJIrLXB7tBMjFS3QIYKNyq1F+P1R RNh7cBrXenbHD9E6VEfjD1GLZibnH/QDqWZXBp7AaR4s8yZkHnViYfE8BTrQ6mrQA/WR fImgeagkNDsfFcNFXZDvdgMaG0X4DXLZOvPHplQBaFOR2A4m+N6HaQa1HmJs+BFAKaB3 AaSkAxApqQ6lnxI1BzEs6Xp3FNl/aO62j9poMFlVdtEk/5ZO/K25YXZWgXou0lwN/0Hl OsrDOSb9QWcgMfNBBOVGW1thaSP+9/pi2MJwUcSuXheATj0R7JUR2YZ2jIozWPFgjaEP pGEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=QBVk9BlGsjPeQ1A/asALKwEg/h8wn3ZSor/zRm2l0pY=; b=Y5LlWGzKrhnvZ30QuJVBwmmdBDUg4J2Bhcwf+4qySAF1eqhHc996V9m+GT/ioMmIwK ovkQLOtLg9B54QlHlssypv78IHd32wxCouFAGJeoaiM+DPzKh01wucDFj4md+nHYTM7y eKNhAolypnuSFjNhu0rb1aryx0KW5d0DBpYLD1HZWVr4KACqVPnc6PGg1LM8dGwZaMF9 krLh2EIYFCAahtE9wHxz/N7cOaWn3181q8tCE6g9cxrtjP30u8cnL+Q2aCBg0KDht7TQ LME2cUZCqOodpENoxbyRZxhpwEah3MmtR6yZHGcMD91KEhDOZpgHCUqteXKP+C4q+5kS zq9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kboRYuQn; 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=pass (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 h9-20020ac85e09000000b002f391d4e5dcsi1209846qtx.362.2022.06.01.11.09.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jun 2022 11:09:43 -0700 (PDT) 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=pass header.i=@linaro.org header.s=google header.b=kboRYuQn; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwSmt-0006pq-5i for patch@linaro.org; Wed, 01 Jun 2022 14:09:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwSj6-0000rx-UH for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:51 -0400 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]:40888) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwSj5-0004x0-Cx for qemu-devel@nongnu.org; Wed, 01 Jun 2022 14:05:48 -0400 Received: by mail-ej1-x634.google.com with SMTP id fu3so3885613ejc.7 for ; Wed, 01 Jun 2022 11:05:47 -0700 (PDT) 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=QBVk9BlGsjPeQ1A/asALKwEg/h8wn3ZSor/zRm2l0pY=; b=kboRYuQnFLkWTTKJy91wyaYCKhHv68Avme1dv/ZSG1RnYjJmzN53PQh5vBbjjGn1X4 A/ksk4I/FmNoO8zoG0dZVDejp6Wosx2+736/vLNV3ZwNjkUkV/WjFUGRYPxTIGr3z/bW v4QVBOwOaK9qSCKxibvsfj66pdDHnq8xnJ++VQQWyrDjdRVFBIPG4BdVvAnLkjnZUkzx xukBaqv4CXiCd6uUmAobNBjPBdR66/OuSJe/MItuKrIjWx2l8F9wRNUXfvwatz9nCdxd r4EFsSUBo/dRozNTBMjlb7lDDEcG5w6vzBTR/VKKi6rSFxNplS+H+/XARaUGs+/Fp1JI 4u2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QBVk9BlGsjPeQ1A/asALKwEg/h8wn3ZSor/zRm2l0pY=; b=Yz0SS9/gRb2FhFyzDpEz2hqFq0WgqH74eUQ1LB2Im9x5ovATgkxu+1S8JmSWMQiOox 0xY1jmn+h0YTxb8NKgC0/s9gHLGJHklfbIVbFA/Qu4YAp688uZ58/O3gHYN/872o34Em 8Kr6pcSD+0v5EWdQmTlxIVFAjHa3KgSOgLgS8jrL6KXKBXt65394zH4pU8e+z7Y0V9it Sfa4dartihiUV5V6/wV9oBt+aGiLL56npJnbseimuu+fQCBGt1Va1Hn2tQBbNDPyB7Fe XBlgRXwfaHliOZprrAWHIwXGqFK+7Tqy1eJfpeVZsQir5+4Hva/3nH2lzTrk/MEwHZIE HkGg== X-Gm-Message-State: AOAM532ktDyg9SMMPlPviJTL9T+UUiOXsTokWmL5prXTiPHokwZus7Vi SnjSkuKkGVMbJr7wuQEO40JaIHvD8gzgxw== X-Received: by 2002:a17:907:6e88:b0:707:ea6b:5e15 with SMTP id sh8-20020a1709076e8800b00707ea6b5e15mr680117ejc.57.1654106745671; Wed, 01 Jun 2022 11:05:45 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f3-20020a056402150300b0042dd3bf1403sm1271778edw.54.2022.06.01.11.05.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 11:05:43 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1CE711FFBC; Wed, 1 Jun 2022 19:05:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PULL 04/33] meson.build: fix summary display of test compilers Date: Wed, 1 Jun 2022 19:05:08 +0100 Message-Id: <20220601180537.2329566-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220601180537.2329566-1-alex.bennee@linaro.org> References: <20220601180537.2329566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::634; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x634.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The recent refactoring of configure.sh dropped a number of variables we relied on for printing out information. Make it simpler. Fixes: eebf199c09 (tests/tcg: invoke Makefile.target directly from QEMU's makefile) Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20220527153603.887929-5-alex.bennee@linaro.org> diff --git a/meson.build b/meson.build index bf318d9cbb..bc6234c85e 100644 --- a/meson.build +++ b/meson.build @@ -3735,12 +3735,8 @@ foreach target: target_dirs config_cross_tcg = keyval.load(tcg_mak) target = config_cross_tcg['TARGET_NAME'] compiler = '' - if 'DOCKER_CROSS_CC_GUEST' in config_cross_tcg - summary_info += {target + ' tests': config_cross_tcg['DOCKER_CROSS_CC_GUEST'] + - ' via ' + config_cross_tcg['DOCKER_IMAGE']} - elif 'CROSS_CC_GUEST' in config_cross_tcg - summary_info += {target + ' tests' - : config_cross_tcg['CROSS_CC_GUEST'] } + if 'CC' in config_cross_tcg + summary_info += {target + ' tests': config_cross_tcg['CC']} endif endif endforeach