| Message ID | 20180424152405.10304-19-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | fix building of tests/tcg | expand |
On 04/24/2018 12:23 PM, Alex Bennée wrote: > While you can construct a compile command that does work using the > x86_64 host compiler that most people use this is flakey. Different > distros handle this is different ways so we default to using a known > good i386 compiler via docker. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > > --- > v3 > - add runner for runcom > --- > tests/tcg/i386/Makefile.include | 9 +++++++++ > tests/tcg/i386/Makefile.target | 9 +++++++++ > 2 files changed, 18 insertions(+) > create mode 100644 tests/tcg/i386/Makefile.include > > diff --git a/tests/tcg/i386/Makefile.include b/tests/tcg/i386/Makefile.include > new file mode 100644 > index 0000000000..be1c3008dd > --- /dev/null > +++ b/tests/tcg/i386/Makefile.include > @@ -0,0 +1,9 @@ > +# > +# Makefile.include for all i386 > +# > +# There is enough brokeness in x86_64 compilers that we don't default > +# to using the x86_64 system compiler for i386 binaries. > +# > + > +DOCKER_IMAGE=fedora-i386-cross > +DOCKER_CROSS_COMPILER=gcc > diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target > index 2f27b65e2d..39a1627650 100644 > --- a/tests/tcg/i386/Makefile.target > +++ b/tests/tcg/i386/Makefile.target > @@ -28,3 +28,12 @@ hello-i386: LDFLAGS+=-nostdlib > test-i386: test-i386.c test-i386-code16.S test-i386-vm86.S test-i386.h test-i386-shift.h test-i386-muldiv.h > $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \ > $(<D)/test-i386.c $(<D)/test-i386-code16.S $(<D)/test-i386-vm86.S -lm > + > +# Specialist test runners > +.PHONY: pi_10.com > +pi_10.com: > + cp $(I386_SRC)/pi_10.com . > + > +run-runcom: runcom pi_10.com > + $(call quiet-command, $(QEMU) ./runcom ./pi_10.com > runcom.out, "TEST", "$< on $(TARGET_NAME)") > + Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> "make run-tcg-tests-i386-linux-user" without ASan: Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
diff --git a/tests/tcg/i386/Makefile.include b/tests/tcg/i386/Makefile.include new file mode 100644 index 0000000000..be1c3008dd --- /dev/null +++ b/tests/tcg/i386/Makefile.include @@ -0,0 +1,9 @@ +# +# Makefile.include for all i386 +# +# There is enough brokeness in x86_64 compilers that we don't default +# to using the x86_64 system compiler for i386 binaries. +# + +DOCKER_IMAGE=fedora-i386-cross +DOCKER_CROSS_COMPILER=gcc diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target index 2f27b65e2d..39a1627650 100644 --- a/tests/tcg/i386/Makefile.target +++ b/tests/tcg/i386/Makefile.target @@ -28,3 +28,12 @@ hello-i386: LDFLAGS+=-nostdlib test-i386: test-i386.c test-i386-code16.S test-i386-vm86.S test-i386.h test-i386-shift.h test-i386-muldiv.h $(CC) $(CFLAGS) $(LDFLAGS) -o $@ \ $(<D)/test-i386.c $(<D)/test-i386-code16.S $(<D)/test-i386-vm86.S -lm + +# Specialist test runners +.PHONY: pi_10.com +pi_10.com: + cp $(I386_SRC)/pi_10.com . + +run-runcom: runcom pi_10.com + $(call quiet-command, $(QEMU) ./runcom ./pi_10.com > runcom.out, "TEST", "$< on $(TARGET_NAME)") +
While you can construct a compile command that does work using the x86_64 host compiler that most people use this is flakey. Different distros handle this is different ways so we default to using a known good i386 compiler via docker. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- v3 - add runner for runcom --- tests/tcg/i386/Makefile.include | 9 +++++++++ tests/tcg/i386/Makefile.target | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100644 tests/tcg/i386/Makefile.include