[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/33] meson.build: fix summary display of test compilers
From: |
Alex Bennée |
Subject: |
[PULL 04/33] meson.build: fix summary display of test compilers |
Date: |
Wed, 1 Jun 2022 19:05:08 +0100 |
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>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
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
--
2.30.2
- [PULL 00/33] testing updates (gitlab, junit, lcitool, x-compile), Alex Bennée, 2022/06/01
- [PULL 04/33] meson.build: fix summary display of test compilers,
Alex Bennée <=
- [PULL 06/33] tests/docker: update debian-armhf-cross with lcitool, Alex Bennée, 2022/06/01
- [PULL 02/33] .gitlab-ci.d/crossbuilds: Fix the dependency of the cross-i386-tci job, Alex Bennée, 2022/06/01
- [PULL 01/33] .gitlab-ci.d/container-cross: Fix RISC-V container dependencies / stages, Alex Bennée, 2022/06/01
- [PULL 03/33] gitlab-ci: add meson JUnit test result into report, Alex Bennée, 2022/06/01
- [PULL 10/33] tests/docker: update debian-ppc64el-cross with lcitool, Alex Bennée, 2022/06/01
- [PULL 07/33] tests/docker: update debian-armel-cross with lcitool, Alex Bennée, 2022/06/01
- [PULL 05/33] tests/lcitool: fix up indentation to correct style, Alex Bennée, 2022/06/01
- [PULL 09/33] tests/docker: update debian-mips64el-cross with lcitool, Alex Bennée, 2022/06/01
- [PULL 13/33] build: clean up ninja invocation, Alex Bennée, 2022/06/01
- [PULL 08/33] tests/docker: update debian-mipsel-cross with lcitool, Alex Bennée, 2022/06/01