| Message ID | 20230119180419.30304-15-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | testing/next updates (gitlab, docker, check-tcg) | expand |
On 19/1/23 19:04, Alex Bennée wrote: > This image is perfectly capable of building QEMU, and indeed we do > that on gitlab. Drop the DOCKER_PARTIAL_IMAGES setting so we can also > test the gitlab build locally. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > tests/docker/Makefile.include | 1 - > 1 file changed, 1 deletion(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On 1/19/23 08:04, Alex Bennée wrote: > This image is perfectly capable of building QEMU, and indeed we do > that on gitlab. Drop the DOCKER_PARTIAL_IMAGES setting so we can also > test the gitlab build locally. > > Signed-off-by: Alex Bennée<alex.bennee@linaro.org> > --- > tests/docker/Makefile.include | 1 - > 1 file changed, 1 deletion(-) Why are we doing so, though? Unlike the other container-cross.yml jobs, we are not cross-compiling. We are building for an x86_64 host, not a tricore host. We appear to be using this container simply to provide a cross-compiler for compiling tricore tests. Which is fine, I suppose, but I think the job should be modeled more like build-some-softmmu, instead of modeled like a cross-build. r~
Richard Henderson <richard.henderson@linaro.org> writes: > On 1/19/23 08:04, Alex Bennée wrote: >> This image is perfectly capable of building QEMU, and indeed we do >> that on gitlab. Drop the DOCKER_PARTIAL_IMAGES setting so we can also >> test the gitlab build locally. >> Signed-off-by: Alex Bennée<alex.bennee@linaro.org> >> --- >> tests/docker/Makefile.include | 1 - >> 1 file changed, 1 deletion(-) > > Why are we doing so, though? Only so I could debug what was failing upstream. > Unlike the other container-cross.yml jobs, we are not cross-compiling. > We are building for an x86_64 host, not a tricore host. > > We appear to be using this container simply to provide a > cross-compiler for compiling tricore tests. Which is fine, I suppose, > but I think the job should be modeled more like build-some-softmmu, > instead of modeled like a cross-build. It's just to work around the fact we don't have QEMU test coverage for our debian-all-test-cross because of the custom binutils bits. That's why it gained the ability to build QEMU (albeit just one target).
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 665ddde518..bfb0dcac21 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -128,7 +128,6 @@ DOCKER_PARTIAL_IMAGES += debian-mips-cross DOCKER_PARTIAL_IMAGES += debian-nios2-cross DOCKER_PARTIAL_IMAGES += debian-riscv64-test-cross DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross -DOCKER_PARTIAL_IMAGES += debian-tricore-cross DOCKER_PARTIAL_IMAGES += debian-xtensa-cross DOCKER_PARTIAL_IMAGES += fedora-cris-cross
This image is perfectly capable of building QEMU, and indeed we do that on gitlab. Drop the DOCKER_PARTIAL_IMAGES setting so we can also test the gitlab build locally. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- tests/docker/Makefile.include | 1 - 1 file changed, 1 deletion(-)