tests/tcg/Makefile: update to be called from Makefile.target
This make is now invoked from each individual target make with the appropriate CC and EXTRA_CFLAGS set for each guest. It then includes additional Makefile.targets from: - tests/tcg/multiarch (always) - tests/tcg/$(TARGET_BASE_ARCH) (if available) - tests/tcg/$(TARGET_NAME) The order is important as the later Makefile's may want to suppress TESTS from its base arch profile. Each included Makefile.target is responsible for adding TESTS as well as defining any special build instructions for individual tests. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Alex Bennée
parent
97103c256e
commit
7e97017e7d
@ -2156,6 +2156,12 @@ W: https://travis-ci.org/qemu/qemu
|
|||||||
W: https://app.shippable.com/github/qemu/qemu
|
W: https://app.shippable.com/github/qemu/qemu
|
||||||
W: http://patchew.org/QEMU/
|
W: http://patchew.org/QEMU/
|
||||||
|
|
||||||
|
Guest Test Compilation Support
|
||||||
|
M: Alex Bennée <alex.bennee@linaro.org>
|
||||||
|
R: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
||||||
|
F: tests/tcg/Makefile
|
||||||
|
L: qemu-devel@nongnu.org
|
||||||
|
|
||||||
Documentation
|
Documentation
|
||||||
-------------
|
-------------
|
||||||
Build system architecture
|
Build system architecture
|
||||||
|
|||||||
@ -1,125 +1,94 @@
|
|||||||
|
# -*- Mode: makefile -*-
|
||||||
|
#
|
||||||
|
# TCG tests
|
||||||
|
#
|
||||||
|
# These are complicated by the fact we want to build them for guest
|
||||||
|
# systems. This requires knowing what guests we are building and which
|
||||||
|
# ones we have cross-compilers for or docker images with
|
||||||
|
# cross-compilers.
|
||||||
|
#
|
||||||
|
# The tests themselves should be as minimal as possible as
|
||||||
|
# cross-compilers don't always have a large amount of libraries
|
||||||
|
# available.
|
||||||
|
#
|
||||||
|
# We only include the host build system for SRC_PATH and we don't
|
||||||
|
# bother with the common rules.mk. We expect the following:
|
||||||
|
#
|
||||||
|
# CC - the C compiler command
|
||||||
|
# EXTRA_CFLAGS - any extra CFLAGS
|
||||||
|
# BUILD_STATIC - are we building static binaries
|
||||||
|
#
|
||||||
|
# By default all tests are statically compiled but some host systems
|
||||||
|
# may not package static libraries by default. If an external
|
||||||
|
# cross-compiler can only build dynamic libraries the user might need
|
||||||
|
# to make extra efforts to ensure ld.so can link at runtime when the
|
||||||
|
# tests are run.
|
||||||
|
#
|
||||||
|
# We also accept SPEED=slow to enable slower running tests
|
||||||
|
#
|
||||||
|
# We also expect to be in the tests build dir for the FOO-linux-user.
|
||||||
|
#
|
||||||
|
|
||||||
-include ../../config-host.mak
|
-include ../../config-host.mak
|
||||||
-include $(SRC_PATH)/rules.mak
|
-include ../config-target.mak
|
||||||
|
|
||||||
$(call set-vpath, $(SRC_PATH)/tests/tcg)
|
quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1))
|
||||||
|
|
||||||
QEMU=../../i386-linux-user/qemu-i386
|
# Tests we are building
|
||||||
QEMU_X86_64=../../x86_64-linux-user/qemu-x86_64
|
TESTS=
|
||||||
CC_X86_64=$(CC_I386) -m64
|
|
||||||
|
|
||||||
QEMU_INCLUDES += -I../..
|
# Start with a blank slate, the build targets get to add stuff first
|
||||||
CFLAGS=-Wall -O2 -g -fno-strict-aliasing
|
CFLAGS=
|
||||||
#CFLAGS+=-msse2
|
QEMU_CFLAGS=
|
||||||
LDFLAGS=
|
LDFLAGS=
|
||||||
|
|
||||||
# TODO: automatically detect ARM and MIPS compilers, and run those too
|
# The QEMU for this TARGET
|
||||||
|
QEMU=../qemu-$(TARGET_NAME)
|
||||||
|
|
||||||
# runcom maps page 0, so it requires root privileges
|
# If TCG debugging is enabled things are a lot slower
|
||||||
# also, pi_10.com runs indefinitely
|
ifeq ($(CONFIG_DEBUG_TCG),y)
|
||||||
|
TIMEOUT=45
|
||||||
I386_TESTS=hello-i386 \
|
else
|
||||||
sha1-i386 \
|
TIMEOUT=15
|
||||||
test-i386 \
|
|
||||||
test-i386-fprem \
|
|
||||||
# runcom
|
|
||||||
|
|
||||||
# native i386 compilers sometimes are not biarch. assume cross-compilers are
|
|
||||||
ifneq ($(ARCH),i386)
|
|
||||||
I386_TESTS+=run-test-x86_64
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
TESTS = test_path
|
# The order we include is important. We include multiarch, base arch
|
||||||
ifneq ($(call find-in-path, $(CC_I386)),)
|
# and finally arch if it's not the same as base arch.
|
||||||
TESTS += $(I386_TESTS)
|
-include $(SRC_PATH)/tests/tcg/multiarch/Makefile.target
|
||||||
|
-include $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.target
|
||||||
|
ifneq ($(TARGET_BASE_ARCH),$(TARGET_NAME))
|
||||||
|
-include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.target
|
||||||
endif
|
endif
|
||||||
|
|
||||||
all: $(patsubst %,run-%,$(TESTS))
|
# Add the common build options
|
||||||
test: all
|
CFLAGS+=-Wall -O0 -g -fno-strict-aliasing
|
||||||
|
ifeq ($(BUILD_STATIC),y)
|
||||||
|
LDFLAGS+=-static
|
||||||
|
endif
|
||||||
|
|
||||||
# rules to run tests
|
%: %.c
|
||||||
|
$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS)
|
||||||
|
|
||||||
.PHONY: $(patsubst %,run-%,$(TESTS))
|
all: $(TESTS)
|
||||||
|
|
||||||
|
#
|
||||||
|
# Test Runners
|
||||||
|
#
|
||||||
|
# By default we just run the test with the appropriate QEMU for the
|
||||||
|
# target. More advanced tests may want to override the runner in their
|
||||||
|
# specific make rules. Additional runners for the same binary should
|
||||||
|
# be added to EXTRA_RUNS.
|
||||||
|
#
|
||||||
|
|
||||||
|
RUN_TESTS=$(patsubst %,run-%, $(TESTS))
|
||||||
|
RUN_TESTS+=$(EXTRA_RUNS)
|
||||||
|
|
||||||
run-%: %
|
run-%: %
|
||||||
-$(QEMU) ./$*
|
$(call quiet-command, \
|
||||||
|
timeout $(TIMEOUT) $(QEMU) $< > $<.out, \
|
||||||
|
"TEST", "$< on $(TARGET_NAME)")
|
||||||
|
|
||||||
run-hello-i386: hello-i386
|
.PHONY: run
|
||||||
run-sha1-i386: sha1-i386
|
run: $(RUN_TESTS)
|
||||||
|
|
||||||
run-test-i386: test-i386
|
# There is no clean target, the calling make just rm's the tests build dir
|
||||||
./test-i386 > test-i386.ref
|
|
||||||
-$(QEMU) test-i386 > test-i386.out
|
|
||||||
@if diff -u test-i386.ref test-i386.out ; then echo "Auto Test OK"; fi
|
|
||||||
|
|
||||||
run-test-i386-fprem: test-i386-fprem
|
|
||||||
./test-i386-fprem > test-i386-fprem.ref
|
|
||||||
-$(QEMU) test-i386-fprem > test-i386-fprem.out
|
|
||||||
@if diff -u test-i386-fprem.ref test-i386-fprem.out ; then echo "Auto Test OK"; fi
|
|
||||||
|
|
||||||
run-test-x86_64: test-x86_64
|
|
||||||
./test-x86_64 > test-x86_64.ref
|
|
||||||
-$(QEMU_X86_64) test-x86_64 > test-x86_64.out
|
|
||||||
@if diff -u test-x86_64.ref test-x86_64.out ; then echo "Auto Test OK"; fi
|
|
||||||
|
|
||||||
|
|
||||||
run-runcom: runcom
|
|
||||||
-$(QEMU) ./runcom $(SRC_PATH)/tests/pi_10.com
|
|
||||||
|
|
||||||
run-test_path: test_path
|
|
||||||
./test_path
|
|
||||||
|
|
||||||
# rules to compile tests
|
|
||||||
|
|
||||||
hello-i386: hello-i386.c
|
|
||||||
$(CC_I386) -nostdlib $(CFLAGS) -static $(LDFLAGS) -o $@ $<
|
|
||||||
strip $@
|
|
||||||
|
|
||||||
# i386/x86_64 emulation test (test various opcodes) */
|
|
||||||
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_I386) $(QEMU_INCLUDES) $(CFLAGS) $(LDFLAGS) -o $@ \
|
|
||||||
$(<D)/test-i386.c $(<D)/test-i386-code16.S $(<D)/test-i386-vm86.S -lm
|
|
||||||
|
|
||||||
test-i386-fprem: test-i386-fprem.c
|
|
||||||
$(CC_I386) $(QEMU_INCLUDES) $(CFLAGS) $(LDFLAGS) -o $@ $^
|
|
||||||
|
|
||||||
test-x86_64: test-i386.c \
|
|
||||||
test-i386.h test-i386-shift.h test-i386-muldiv.h
|
|
||||||
$(CC_X86_64) $(QEMU_INCLUDES) $(CFLAGS) $(LDFLAGS) -o $@ $(<D)/test-i386.c -lm
|
|
||||||
|
|
||||||
# vm86 test
|
|
||||||
runcom: runcom.c
|
|
||||||
$(CC_I386) $(CFLAGS) $(LDFLAGS) -o $@ $<
|
|
||||||
|
|
||||||
# speed test
|
|
||||||
sha1-i386: sha1.c
|
|
||||||
$(CC_I386) $(CFLAGS) $(LDFLAGS) -o $@ $<
|
|
||||||
|
|
||||||
# arm test
|
|
||||||
hello-arm: hello-arm.o
|
|
||||||
arm-linux-ld -o $@ $<
|
|
||||||
|
|
||||||
hello-arm.o: hello-arm.c
|
|
||||||
arm-linux-gcc -Wall -g -O2 -c -o $@ $<
|
|
||||||
|
|
||||||
test-arm-iwmmxt: test-arm-iwmmxt.s
|
|
||||||
cpp < $< | arm-linux-gnu-gcc -Wall -static -march=iwmmxt -mabi=aapcs -x assembler - -o $@
|
|
||||||
|
|
||||||
# MIPS test
|
|
||||||
hello-mips: hello-mips.c
|
|
||||||
mips-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -O2 -o $@ $<
|
|
||||||
|
|
||||||
hello-mipsel: hello-mips.c
|
|
||||||
mipsel-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -O2 -o $@ $<
|
|
||||||
|
|
||||||
# testsuite for the CRIS port.
|
|
||||||
test-cris:
|
|
||||||
$(MAKE) -C cris check
|
|
||||||
|
|
||||||
# testsuite for the LM32 port.
|
|
||||||
test-lm32:
|
|
||||||
$(MAKE) -C lm32 check
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f *~ *.o test-i386.out test-i386.ref \
|
|
||||||
test-x86_64.log test-x86_64.ref qruncom $(TESTS)
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user