This cleans up a few bits and pieces although doesn't totally solve
the issue of an apparent stall while meson builds the docker image.
However with these changes there should be no difference between the
meson build and the equivalent "make docker-image-foo" invocation.
We also finally get rid of the ill-advised magic caching support in
docker.py.
v3
- Update make2test to trigger docker build from Makefile.include.
- add Daniels's suggested console: true patch
- fixed up some unref vars from the reverts
v2
I've restored the configure based compiler checks for so we can build
roms and the vdso blobs again. It looks like we could never build roms
with container based images so I've left it for now. Unlike the vdso
build we can't trigger a container build through Makefile.prereqs.
TODO
----
I've still got Ilya's s390 test image patches to look at but I'm
sending v2 because enough people are hitting issues.
I also need to look at the timestamp stuff that Pierrick has suggested
to see if that improves the caching from the registry.
The following still need review:
tests/tcg: add console property to docker image custom target
scripts/make2mtest: add docker dependencies for check-tcg-% targets
tests/docker: fix brown bag typo for docker-ccache
tests/docker: swap --quiet for --verbose
tests/docker: add container registry to configure and use
tests/tcg: use --add-current-user when building containers
configure: re-purpose the tcg test compiler configs for vdso building
Revert "tests/tcg/meson.build: implement ./configure -cross-cc-* options"
Please test and review.
Alex.
Alex Bennée (15):
Revert "configure: remove cross_cc and gdb detection logic"
Revert "tests/tcg/meson.build: implement ./configure -cross-cc-*
options"
Revert "tests/tcg/meson.build: implement ./configure containers
options"
configure: re-purpose the tcg test compiler configs for vdso building
tests/tcg: prefix meson built docker tags with qemu/
tests/tcg: use --add-current-user when building containers
tests/docker: add container registry to configure and use
tests/docker: remove used _read_qemu_dockerfile
tests/docker: strip remaining caching logic from docker.py
tests/docker: add specific command to parser
tests/docker: swap --quiet for --verbose
tests/docker: fix brown bag typo for docker-ccache
gitlab: update the @user id mapping file
scripts/make2mtest: add docker dependencies for check-tcg-% targets
tests/tcg: add console property to docker image custom target
Daniel P. Berrangé (2):
configure: correctly honour --disable-containers
tests/tcg: improve check for working cross compilers
configure | 491 +++++++++++++++++++++++-
tests/tcg/test_cc.c | 6 +-
.gitlab-map-auto | 8 +-
linux-user/aarch64/Makefile.vdso | 2 +-
linux-user/arm/Makefile.vdso | 2 +-
linux-user/hppa/Makefile.vdso | 2 +-
linux-user/i386/Makefile.vdso | 2 +-
linux-user/loongarch64/Makefile.vdso | 2 +-
linux-user/ppc/Makefile.vdso | 2 +-
linux-user/riscv/Makefile.vdso | 2 +-
linux-user/s390x/Makefile.vdso | 2 +-
linux-user/sh4/Makefile.vdso | 2 +-
linux-user/x86_64/Makefile.vdso | 2 +-
meson_options.txt | 95 +----
scripts/coverity-scan/run-coverity-scan | 2 +-
scripts/gitlab-map-update | 2 +-
scripts/meson-buildoptions.sh | 3 +
scripts/mtest2make.py | 35 +-
tests/docker/Makefile.include | 16 +-
tests/docker/docker.py | 188 ++++-----
tests/tcg/meson.build | 72 +---
21 files changed, 627 insertions(+), 311 deletions(-)
--
2.47.3
