On 04/24/2018 12:23 PM, Alex Bennée wrote: > As before, using Debian SID compilers. > > Signed-off-by: Alex Bennée <[email protected]> > --- > tests/docker/Makefile.include | 1 + > tests/docker/dockerfiles/debian-m68k-cross.docker | 12 ++++++++++++ > tests/tcg/m68k/Makefile.include | 2 ++ > 3 files changed, 15 insertions(+) > create mode 100644 tests/docker/dockerfiles/debian-m68k-cross.docker > create mode 100644 tests/tcg/m68k/Makefile.include > > diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include > index 2471c4f30a..15c52127c7 100644 > --- a/tests/docker/Makefile.include > +++ b/tests/docker/Makefile.include > @@ -64,6 +64,7 @@ docker-image-debian-win32-cross: docker-image-debian8-mxe > docker-image-debian-win64-cross: docker-image-debian8-mxe > docker-image-debian-alpha-cross: docker-image-debian-sid > docker-image-debian-hppa-cross: docker-image-debian-sid > +docker-image-debian-m68k-cross: docker-image-debian-sid > docker-image-travis: NOUSER=1 > > # Expand all the pre-requistes for each docker image and test combination > diff --git a/tests/docker/dockerfiles/debian-m68k-cross.docker > b/tests/docker/dockerfiles/debian-m68k-cross.docker > new file mode 100644 > index 0000000000..21ba3b0132 > --- /dev/null > +++ b/tests/docker/dockerfiles/debian-m68k-cross.docker > @@ -0,0 +1,12 @@ > +# > +# Docker cross-compiler target > +# > +# This docker target builds on the debian sid base image which > +# contains cross compilers for Debian "ports" targets. > +# > +FROM qemu:debian-sid > + > +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ > + apt-get install -y --no-install-recommends \ > + gcc-m68k-linux-gnu \ > + libc6-dev-m68k-cross > diff --git a/tests/tcg/m68k/Makefile.include b/tests/tcg/m68k/Makefile.include > new file mode 100644 > index 0000000000..cd7c6bf50d > --- /dev/null > +++ b/tests/tcg/m68k/Makefile.include > @@ -0,0 +1,2 @@ > +DOCKER_IMAGE=debian-m68k-cross > +DOCKER_CROSS_COMPILER=m68k-linux-gnu-gcc
$ make -j1 run-tcg-tests-m68k-linux-user BUILD debian-sid BUILD debian-m68k-cross CROSS-BUILD m68k guest-tests with docker qemu:debian-m68k-cross /source/qemu/tests/tcg/m68k/Makefile.target:8: warning: overriding recipe for target 'run-test-mmap' /source/qemu/tests/tcg/multiarch/Makefile.target:26: warning: ignoring old recipe for target 'run-test-mmap' BUILD debian-sid BUILD debian-m68k-cross CROSS-BUILD m68k guest-tests with docker qemu:debian-m68k-cross /source/qemu/tests/tcg/m68k/Makefile.target:8: warning: overriding recipe for target 'run-test-mmap' /source/qemu/tests/tcg/multiarch/Makefile.target:26: warning: ignoring old recipe for target 'run-test-mmap' RUN-TESTS for m68k /source/qemu/tests/tcg/m68k/Makefile.target:8: warning: overriding recipe for target 'run-test-mmap' /source/qemu/tests/tcg/multiarch/Makefile.target:26: warning: ignoring old recipe for target 'run-test-mmap' TEST test-mmap (default) on m68k TEST sha1 on m68k BROKEN TEST linux-test SKIPPED on m68k TEST testthread on m68k Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Tested-by: Philippe Mathieu-Daudé <[email protected]>
