diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2026-09-06 15:13:14 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2026-09-06 15:13:14 +0100 |
| commit | 46fb70f8a167d90e768c85d7a108bc7de0877f52 (patch) | |
| tree | 7b633d98648c9bdcf750430e78a77fde1c152109 | |
| parent | ff1d2d19d7e24893e2012d879f8e73077e17b9bd (diff) | |
| parent | f7b7d7270eed9f22110f2a2c0d4bb74b92f991f8 (diff) | |
| download | qemu-46fb70f8a167d90e768c85d7a108bc7de0877f52.tar.gz qemu-46fb70f8a167d90e768c85d7a108bc7de0877f52.zip | |
Merge tag 'pbouvier/pr/tcg-tests-20260904' of https://gitlab.com/p-b-o/qemu into staging
See link to series for details. It might impact anyone having
docker/podman installed but no cross compilers.
Changes:
- [PATCH] tests/tcg/meson.build: fix build_test_depends (Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>)
Link: https://lore.kernel.org/qemu-devel/20260904200614.2808877-1-pierrick.bouvier@oss.qualcomm.com
# -----BEGIN PGP SIGNATURE-----
#
# iQGzBAABCgAdFiEEN8FWlNi6l2Sxlz/btEQ30ZwoYt8FAmqbJbQACgkQtEQ30Zwo
# Yt829Av/QG29gQYlq89tbwxnmNfY2s14eOxNcC536yEaCW2TO9kDIvcGnTaNnsv1
# Z1OD5ckDx89/Nfoyt+O6sh8M77jX7nBnTKmhGIywj7HgmlIt6POMakxz9bq1+DiG
# fzjUMpiDVqR3gPLZ6HdTDKCmni5kafD/AiH8aCfSCmK+iiXoCqfmVtUql3W/ngpY
# PCohN9jCOgUJUGiEHLNLc75Xa36PW3x5gcDffejcVULelC6B02pBM9j+z3p0Qm7z
# q7gHx7OPbyA4BW1kzFrQ6K/AE+iPpJwdjYdosMpqTghuTydCSRrj1fpiZwyf55v9
# vrlpbYmHB6LZWBHr3274PBas/Npr0yuHth/sftq4sphsoN+RcSecVgzoW+XPauRy
# ci2Lm1t/ocAdo0SvvKvDtu+aqbMY9JHrXNeV68aKTXiSBA9irG6DUVRwHdwSLJXh
# IMj9O//aRAByrKfISi8EDAg2zon70/PtheS2Cz3YknmwaedszMNVdlVbKG4sjwxw
# dwO3Q1L4
# =Dc4W
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Sep 4 21:10:28 2026 BST
# gpg: using RSA key 37C15694D8BA9764B1973FDBB44437D19C2862DF
# gpg: Good signature from "Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 37C1 5694 D8BA 9764 B197 3FDB B444 37D1 9C28 62DF
* tag 'pbouvier/pr/tcg-tests-20260904' of https://gitlab.com/p-b-o/qemu:
tests/tcg/meson.build: fix build_test_depends
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | tests/tcg/meson.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index 243cdb5fc8..d41a228fb3 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -263,8 +263,8 @@ foreach target, plan: tcg_tests endif if not has_cc and has_docker - build_test_depends = image_targets[cc_dockerfile] - build_test_depend_files = dockerfile + build_test_depends += image_targets[cc_dockerfile] + build_test_depend_files += dockerfile mount = meson.project_source_root() mount = mount + ':' + mount here = meson.project_build_root() |