From patchwork Wed Feb 24 11:49:20 2021 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: 386792 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp306204jap; Wed, 24 Feb 2021 03:50:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJyPkLYVtTh07dc6uZg+hgFnXZrXG4rtWGJipTGC+iVz4FydPhx7goKYqeMeO6Av9WgOjaqZ X-Received: by 2002:a25:2f43:: with SMTP id v64mr46697029ybv.302.1614167423066; Wed, 24 Feb 2021 03:50:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614167423; cv=none; d=google.com; s=arc-20160816; b=yY84/I1iNQbnjQ/4MUrd5JKAZQ1Kj7UugFbAP3E0PJ6PnLZps337YDx+QCozbXUVkq 6VjfAo8Fz22gm0nmfvEARXBbuGzI2X6AXZ9gpAzRnlRTaLIrfTPmn3L0kZ8y9HPRkF3J Fh81m8IhvR34efaVhDnituuo5c9+YpxmZwxq5RyhFtr6dS7aE9tfmOfsQ8pid+oBJQ4b 5BrABH9NnfpWMHMFbjdA5JWKOmyJPqkwhOy2ADs+5HTiTaVfwYIJE+I1AoFykw9CwsP4 yltnyLJxbjwgTTa9N4dvUxNHMZpdihxyLjar+3VUKkSaJvh8xf8UHj6p8qaE5eCuI5kD ocJQ== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=yl9N9f02916jOdl75tlt9hwNyZRHfETE4hJ5ov352dM=; b=UvCxvRJuHDcEv2Y+d3DUzvlWLKAV0fywfKYg7mxzNZkp5Ry+XS0YXnDiLBCLSz96p4 RMSFDOq1xQzaRaC35SOUpfGfMvtWHcgtCjXULdvbuVTmyPfjkzoJh0BV5g4Q88/gNXyj 0/269+Z8MtHdLT5qfjWuftBvc51PkBbz1zq2bSMd/RzTi4WAX5qGe0A6RSd5DPeyMeE5 IxQfHEaO5NvEnk9YEFguvN4BAER0Xfzm1BvZPCKGyduRZjd6E0sRfBe2DlqnO+n2rd8h oDPWU+yjgrNsZvbcrLOHPefCDzFcYQnQ2HeL64Ysc9B+r5Zd7jUHc97umWXhWpTB1FB2 9PvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CBGfjhb6; 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 p16si1958524ybg.295.2021.02.24.03.50.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Feb 2021 03:50:23 -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=CBGfjhb6; 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 ([::1]:57362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEsgQ-0005rw-GM for patch@linaro.org; Wed, 24 Feb 2021 06:50:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEsfe-0005qr-Ps for qemu-devel@nongnu.org; Wed, 24 Feb 2021 06:49:34 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:42868) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEsfd-0002Tc-37 for qemu-devel@nongnu.org; Wed, 24 Feb 2021 06:49:34 -0500 Received: by mail-wr1-x431.google.com with SMTP id r3so1589311wro.9 for ; Wed, 24 Feb 2021 03:49:32 -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=yl9N9f02916jOdl75tlt9hwNyZRHfETE4hJ5ov352dM=; b=CBGfjhb6iZASoXsJ+gzezw1cNHGK19HiG6oS/htS/RrYT7u+1QE47t+X0kOL90YwQe yRAf5HhUAhG4Jo7rVE1zGHnRlyKcBokF6k5dqjqZixd5jqdIjxyIol//uEGPGBX2J61V nM19yqcL5IXCGtzyU/7sdeVB7Av4NV+HrWPOwQMW0zhEz8FFfarWqorKQ/z4Z+mi89LG stXdoTeeOSmWqs5oltfyS05GVtcIigLM+pRww0KVL7sXmSDJuNzsl/usjWD0yLhmqjR4 4xkUdB0EayJ0t+XEPsVGlqTzBmTCkBbZfxUXixIbrhoNuZfijDIvNVvpEF3yKnDTtUNx N+mA== 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=yl9N9f02916jOdl75tlt9hwNyZRHfETE4hJ5ov352dM=; b=t647MpjAPbSH3wUpgRUUHcwTYo4LeUeJrhMcwDkwtXpppgweyEFwGcMffXCBW9nHPN HRI/CmP72cKYaZT2cV0obXcw6sCGFI7G6DjH+gZ4iuHHmqOYQ/FIeyTxaSh4JP0W8cDF 8a6+lrDF2U7Wjjgkm8YLbciryMbms2BBK8np6Qq+pUTh6qrUZ3WnlKAiVqkXN60WD/bI 52vejJaH7VR+WY73V/wPwTfOjuu34UWYIQut+hy9FEAEUu6KwS68fUJznbIQChOoJlLJ YKmBkoausVtYByr8drl6nR0NPmz55nzeCiSvtxe8RoFKgJfLy0acr/YDRwVzhaEVWh7V hwVQ== X-Gm-Message-State: AOAM5314AaGDx2atahwecBqELF5QawDhb0XSq3XqfhignciJmCdUbQAP SB+i1jbIjCLvl+ZungkW0p756g== X-Received: by 2002:a5d:4705:: with SMTP id y5mr24069032wrq.313.1614167371593; Wed, 24 Feb 2021 03:49:31 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z13sm3071189wrh.65.2021.02.24.03.49.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 03:49:27 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 75F0C1FF87; Wed, 24 Feb 2021 11:49:26 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 1/7] meson.build: expose TCG cross compiler information in summary Date: Wed, 24 Feb 2021 11:49:20 +0000 Message-Id: <20210224114926.6303-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210224114926.6303-1-alex.bennee@linaro.org> References: <20210224114926.6303-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Blink and you miss the cross TCG compiler stuff so lets display it with the rest of the compiler information. Signed-off-by: Alex Bennée Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Acked-by: Paolo Bonzini Message-Id: <20210222101455.12640-2-alex.bennee@linaro.org> -- 2.20.1 diff --git a/meson.build b/meson.build index 05a67c20d9..f3db83e974 100644 --- a/meson.build +++ b/meson.build @@ -2509,6 +2509,24 @@ endif summary_info += {'strip binaries': get_option('strip')} summary_info += {'sparse': sparse.found() ? sparse.full_path() : false} summary_info += {'mingw32 support': targetos == 'windows'} + +# snarf the cross-compilation information for tests +foreach target: target_dirs + tcg_mak = meson.current_build_dir() / 'tests/tcg' / 'config-' + target + '.mak' + if fs.exists(tcg_mak) + 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'] } + endif + endif +endforeach + summary(summary_info, bool_yn: true, section: 'Compilation') # Targets and accelerators diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 551c02f469..36b8a73a54 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -263,11 +263,3 @@ for target in $target_list; do echo "DOCKER_CROSS_CC_GUEST=$container_cross_cc" >> $config_target_mak fi done - -# report container support state -echo "cross containers $container" - -if test -n "$enabled_cross_compilers"; then - echo - echo "NOTE: guest cross-compilers enabled:$enabled_cross_compilers" -fi