[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 1/6] meson.build: expose TCG cross compiler information in sum
From: |
Alex Bennée |
Subject: |
[PATCH v1 1/6] meson.build: expose TCG cross compiler information in summary |
Date: |
Wed, 17 Feb 2021 12:19:27 +0000 |
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 <alex.bennee@linaro.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210216102522.6279-1-alex.bennee@linaro.org>
---
meson.build | 18 ++++++++++++++++++
tests/tcg/configure.sh | 8 --------
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/meson.build b/meson.build
index a923f249d8..4462e7279e 100644
--- a/meson.build
+++ b/meson.build
@@ -2508,6 +2508,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 e1b70e25f2..77a18fd289 100755
--- a/tests/tcg/configure.sh
+++ b/tests/tcg/configure.sh
@@ -257,11 +257,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
--
2.20.1
- [PATCH v1 0/6] my current testing/next queue (meson/gitlab/fedora bump), Alex Bennée, 2021/02/17
- [PATCH v1 4/6] docker: Bump Fedora images to release 33, Alex Bennée, 2021/02/17
- [PATCH v1 2/6] gitlab-ci: Display Avocado log content when tests timeout, Alex Bennée, 2021/02/17
- [PATCH v1 1/6] meson.build: expose TCG cross compiler information in summary,
Alex Bennée <=
- [PATCH v1 6/6] tests/acceptance: allow a "graceful" failing for virtio-gpu test, Alex Bennée, 2021/02/17
- [PATCH v1 5/6] travis.yml: Limit simultaneous jobs to 3, Alex Bennée, 2021/02/17
- [PATCH v1 3/6] gitlab-ci.yml: Run check-tcg with TCI, Alex Bennée, 2021/02/17