qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org, cota@braap.org, famz@redhat.com,
	berrange@redhat.com, f4bug@amsat.org,
	richard.henderson@linaro.org, balrogg@gmail.com,
	aurelien@aurel32.net, agraf@suse.de
Cc: qemu-devel@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>
Subject: [Qemu-devel] [PATCH v3 43/46] tests/tcg/Makefile: update to be called from Makefile.target
Date: Tue, 24 Apr 2018 16:24:02 +0100	[thread overview]
Message-ID: <20180424152405.10304-44-alex.bennee@linaro.org> (raw)
In-Reply-To: <20180424152405.10304-1-alex.bennee@linaro.org>

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 it's 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>

---
v2
  - cleaner approach to include sub makefiles
  - move TESTS/VPATH manipulation into sub-makefile
  - avoid double inclusion when TARGET_BASE_ARCH==TARGET_NAME
---
 tests/tcg/Makefile | 162 +++++++++++++++------------------------------
 1 file changed, 53 insertions(+), 109 deletions(-)

diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile
index e12395117a..2116fea915 100644
--- a/tests/tcg/Makefile
+++ b/tests/tcg/Makefile
@@ -1,125 +1,69 @@
+# -*- 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 CC/LD to have been set for
+# us from the parent make as well as being passed EXTRA_CFLAGS.
+#
+# We also expect to be in the tests build dir for the FOO-linux-user.
+#
+
 -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
-QEMU_X86_64=../../x86_64-linux-user/qemu-x86_64
-CC_X86_64=$(CC_I386) -m64
+# Tests we are building
+TESTS=
 
-QEMU_INCLUDES += -I../..
-CFLAGS=-Wall -O2 -g -fno-strict-aliasing
-#CFLAGS+=-msse2
+# Start with a blank slate, the build targets get to add stuff first
+CFLAGS=
+QEMU_CFLAGS=
 LDFLAGS=
 
-# TODO: automatically detect ARM and MIPS compilers, and run those too
-
-# runcom maps page 0, so it requires root privileges
-# also, pi_10.com runs indefinitely
+# The QEMU for this TARGET
+QEMU=../qemu-$(TARGET_NAME)
 
-I386_TESTS=hello-i386 \
-	   sha1-i386 \
-	   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
+# The order we include is important. We include multiarch, base arch and finally arch
+-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
 
-TESTS = test_path
-ifneq ($(call find-in-path, $(CC_I386)),)
-TESTS += $(I386_TESTS)
-endif
-
-all: $(patsubst %,run-%,$(TESTS))
-test: all
-
-# rules to run tests
-
-.PHONY: $(patsubst %,run-%,$(TESTS))
-
-run-%: %
-	-$(QEMU) ./$*
-
-run-hello-i386: hello-i386
-run-sha1-i386: sha1-i386
-
-run-test-i386: test-i386
-	./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
+# Add the common build options
+CFLAGS+=-Wall -O0 -g -fno-strict-aliasing
+LDFLAGS+=-static
 
+%: %.c
+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS)
 
-run-runcom: runcom
-	-$(QEMU) ./runcom $(SRC_PATH)/tests/pi_10.com
+all: $(TESTS)
 
-run-test_path: test_path
-	./test_path
+#
+# 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.
+#
 
-# rules to compile tests
+RUN_TESTS=$(patsubst %,run-%, $(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
+run-%: %
+	$(call quiet-command, $(QEMU) $< > $<.out, "TEST", "$< on $(TARGET_NAME)")
 
-# testsuite for the LM32 port.
-test-lm32:
-	$(MAKE) -C lm32 check
+.PHONY: run
+run: $(RUN_TESTS)
 
-clean:
-	rm -f *~ *.o test-i386.out test-i386.ref \
-           test-x86_64.log test-x86_64.ref qruncom $(TESTS)
+# There is no clean target, the calling make just rm's the tests build dir
-- 
2.17.0

  parent reply	other threads:[~2018-04-24 15:43 UTC|newest]

Thread overview: 102+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-24 15:23 [Qemu-devel] [PATCH v3 00/46] fix building of tests/tcg Alex Bennée
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 01/46] docker: add "probe" command for configure Alex Bennée
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 02/46] configure: add test for docker availability Alex Bennée
2018-04-25  0:06   ` Richard Henderson
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 03/46] configure: add support for --cross-cc-FOO Alex Bennée
2018-04-25  0:10   ` Richard Henderson
2018-04-25  9:10     ` Alex Bennée
2018-04-25 16:27   ` Murilo Opsfelder Araujo
2018-05-16 15:18     ` Alex Bennée
2018-05-16 17:36       ` Murilo Opsfelder Araujo
2018-05-16 20:37         ` Alex Bennée
2018-04-25 17:03   ` Peter Maydell
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 04/46] configure: move i386_cc to cross_cc_i386 Alex Bennée
2018-04-25  0:11   ` Richard Henderson
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 05/46] configure: allow user to specify --cross-cc-cflags-foo= Alex Bennée
2018-04-25  0:12   ` Richard Henderson
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 06/46] configure: set cross_cc_FOO for host compiler Alex Bennée
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 07/46] Makefile: Rename TARGET_DIRS to TARGET_LIST Alex Bennée
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 08/46] docker: Add "cc" subcommand Alex Bennée
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 09/46] docker: extend "cc" command to accept compiler Alex Bennée
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 10/46] docker: allow "cc" command to run in user context Alex Bennée
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 11/46] docker: Makefile.include introduce DOCKER_SCRIPT Alex Bennée
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 12/46] tests/tcg: move architecture independent tests into subdir Alex Bennée
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 13/46] tests/tcg/multiarch: Build fix for linux-test Alex Bennée
2018-04-25  0:13   ` Richard Henderson
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 14/46] tests/tcg/multiarch: enable additional linux-test tests Alex Bennée
2018-04-25  0:14   ` Richard Henderson
2018-04-25  4:07   ` Philippe Mathieu-Daudé
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 15/46] tests/tcg/multiarch: move most output to stdout Alex Bennée
2018-04-25  0:14   ` Richard Henderson
2018-04-25  4:06   ` Philippe Mathieu-Daudé
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 16/46] tests/tcg: move i386 specific tests into subdir Alex Bennée
2018-04-25  0:15   ` Richard Henderson
2018-04-25  3:27   ` Philippe Mathieu-Daudé
2018-04-25  9:08     ` Alex Bennée
2018-04-25 13:42       ` Philippe Mathieu-Daudé
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 17/46] docker: Add fedora-i386-cross image Alex Bennée
2018-04-24 23:04   ` Philippe Mathieu-Daudé
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 18/46] tests/tcg: enable building for i386 Alex Bennée
2018-04-25  3:33   ` Philippe Mathieu-Daudé
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 19/46] tests/tcg/i386: Build fix for hello-i386 Alex Bennée
2018-04-25  0:22   ` Richard Henderson
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 20/46] tests/tcg/i386: fix test-i386 Alex Bennée
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 21/46] tests/tcg/i386: fix test-i386-fprem Alex Bennée
2018-04-25  0:23   ` Richard Henderson
2018-04-25  3:26   ` Thomas Huth
2018-04-25  8:46     ` Alex Bennée
2018-04-25  3:42   ` Philippe Mathieu-Daudé
2018-04-25  8:45     ` Alex Bennée
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 22/46] tests/tcg/i386: disable i386 version of test-i386-ssse Alex Bennée
2018-04-25 21:28   ` Richard Henderson
2018-04-26  8:59     ` Alex Bennée
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 23/46] tests/tcg/x86_64: add Makefile.target Alex Bennée
2018-04-25  4:03   ` Philippe Mathieu-Daudé
2018-04-25  8:43     ` Alex Bennée
2018-04-25 14:01       ` Philippe Mathieu-Daudé
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 24/46] tests/tcg/i386/test-i386: use modern vector_size attributes Alex Bennée
2018-04-25  3:47   ` Philippe Mathieu-Daudé
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 25/46] tests/tcg/i386/test-i386: fix printf format Alex Bennée
2018-04-25 14:06   ` Philippe Mathieu-Daudé
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 26/46] tests/tcg: move ARM specific tests into subdir Alex Bennée
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 27/46] tests/tcg/arm: fix up test-arm-iwmmxt test Alex Bennée
2018-04-25  3:48   ` Philippe Mathieu-Daudé
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 28/46] tests/tcg/aarch64: add Makefile.target Alex Bennée
2018-04-25  3:57   ` Philippe Mathieu-Daudé
2018-04-25  8:43     ` Alex Bennée
2018-04-25 14:21       ` Philippe Mathieu-Daudé
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 29/46] tests/tcg/aarch64: add fcvt test cases for AArch64 Alex Bennée
2018-04-25 14:22   ` Philippe Mathieu-Daudé
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 30/46] tests/tcg: move MIPS specific tests into subdir Alex Bennée
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 31/46] tests/tcg: enable building for MIPS Alex Bennée
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 32/46] tests/tcg/mips: include common mips hello-mips Alex Bennée
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 33/46] tests/tcg: enable building for s390x Alex Bennée
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 34/46] tests/tcg: enable building for ppc64 Alex Bennée
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 35/46] tests/tcg: enable building for Alpha Alex Bennée
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 36/46] tests/tcg/alpha: add Alpha specific tests Alex Bennée
2018-04-24 18:28   ` Richard Henderson
2018-04-25  9:11     ` Alex Bennée
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 37/46] tests/tcg/alpha: fix warnings about write() Alex Bennée
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 38/46] tests/tcg: enable building for HPPA Alex Bennée
2018-04-25 14:08   ` Philippe Mathieu-Daudé
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 39/46] tests/tcg: enable building for m68k Alex Bennée
2018-04-25 14:28   ` Philippe Mathieu-Daudé
2018-04-24 15:23 ` [Qemu-devel] [PATCH v3 40/46] tests/tcg: enable building for sh4 Alex Bennée
2018-04-25 14:16   ` Philippe Mathieu-Daudé
2018-04-24 15:24 ` [Qemu-devel] [PATCH v3 41/46] tests/tcg: enable building for sparc64 Alex Bennée
2018-04-24 15:24 ` [Qemu-devel] [PATCH v3 42/46] tests/tcg: enable building for mips64 Alex Bennée
2018-04-24 15:24 ` Alex Bennée [this message]
2018-04-25 21:26   ` [Qemu-devel] [PATCH v3 43/46] tests/tcg/Makefile: update to be called from Makefile.target Richard Henderson
2018-04-26  9:30     ` Alex Bennée
2018-04-26 20:51       ` Richard Henderson
2018-04-24 15:24 ` [Qemu-devel] [PATCH v3 44/46] Makefile.target: add (clean-)guest-tests targets Alex Bennée
2018-04-24 15:24 ` [Qemu-devel] [PATCH v3 45/46] tests/Makefile.include: add [build|clean|check]-tcg targets Alex Bennée
2018-04-24 23:13   ` Philippe Mathieu-Daudé
2018-04-25 14:15     ` Philippe Mathieu-Daudé
2018-04-25 15:40       ` Alex Bennée
2018-04-25  3:18   ` Philippe Mathieu-Daudé
2018-04-24 15:24 ` [Qemu-devel] [PATCH v3 46/46] tests/tcg: override runners for broken tests (!UPSTREAM) Alex Bennée
2018-04-24 16:58 ` [Qemu-devel] [PATCH v3 00/46] fix building of tests/tcg no-reply
2018-04-25  1:25 ` Philippe Mathieu-Daudé
2018-04-25  6:57   ` Samuel Thibault
2018-04-25  8:39     ` Alex Bennée

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180424152405.10304-44-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=agraf@suse.de \
    --cc=aurelien@aurel32.net \
    --cc=balrogg@gmail.com \
    --cc=berrange@redhat.com \
    --cc=cota@braap.org \
    --cc=f4bug@amsat.org \
    --cc=famz@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).