diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-02-25 19:07:58 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-02-25 19:07:58 +0000 |
| commit | cbcf09872a936ccefef6a34298046d3b9aefc148 (patch) | |
| tree | eccc8b2ac962b1b3d61dac64da6afa295831f04e /meson.build | |
| parent | 51db2d7cf26d05a961ec0ee0eb773594b32cc4a1 (diff) | |
| parent | 93a11007681a8051c07834c52d785a2948ff9632 (diff) | |
| download | qemu-cbcf09872a936ccefef6a34298046d3b9aefc148.zip qemu-cbcf09872a936ccefef6a34298046d3b9aefc148.tar.gz qemu-cbcf09872a936ccefef6a34298046d3b9aefc148.tar.bz2 | |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-updates-240221-1' into staging
Testing tweaks (build, docs, bumps)
- expose cross compiler info in meson pretty print
- bump Fedora to 33
- "graceful" handling of missing virgl config
- updates to the container documentation
- move CODING_STYLE.rst into developer manual
# gpg: Signature made Wed 24 Feb 2021 11:08:03 GMT
# gpg: using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44
* remotes/stsquad/tags/pull-testing-updates-240221-1:
docs: move CODING_STYLE into the developer documentation
docs/devel: add forward reference to check-tcg
docs/devel: update the container based tests
docs/devel: expand on use of containers to build tests
tests/acceptance: allow a "graceful" failing for virtio-gpu test
docker: Bump Fedora images to release 33
meson.build: expose TCG cross compiler information in summary
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/meson.build b/meson.build index 05a67c2..f3db83e 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 |