testing/next (gitlab, junit, lcitool, x-compile)

[PATCH v1 04/33] meson.build: fix summary display of test compilers

Alex Bennée posted 33 patches 3 years, 8 months ago

Download mbox

Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Cornelia Huck <cohuck@redhat.com>, Alexey Kardashevskiy <aik@ozlabs.ru>, "Cédric Le Goater" <clg@kaod.org>, Daniel Henrique Barboza <danielhb413@gmail.com>, David Gibson <david@gibson.dropbear.id.au>, Greg Kurz <groug@kaod.org>, John Snow <jsnow@redhat.com>, Cleber Rosa <crosa@redhat.com>

Expand all Fold all

[PATCH v1 04/33] meson.build: fix summary display of test compilers

Posted by Alex Bennée 3 years, 8 months ago

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 <alex.bennee@linaro.org>
---
 meson.build | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/meson.build b/meson.build
index df7c34b076..b622f37a34 100644
--- a/meson.build
+++ b/meson.build
@@ -3732,12 +3732,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
-- 
2.30.2

Re: [PATCH v1 04/33] meson.build: fix summary display of test compilers

Posted by Richard Henderson 3 years, 8 months ago

On 5/27/22 08:35, Alex Bennée wrote:
> 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 <alex.bennee@linaro.org>
> ---
>   meson.build | 8 ++------
>   1 file changed, 2 insertions(+), 6 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~