[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 46/54] tests/tcg: add run, diff, and skip helper
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v7 46/54] tests/tcg: add run, diff, and skip helper macros |
Date: |
Fri, 15 Jun 2018 20:46:57 +0100 |
As we aren't using the default runners for all the test cases it is
easy to miss out things like timeouts. To help with this we add some
helpers and use them so we only need to make core changes in one
place.
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
---
v5
- new for v5
v5.1
- diff-test->diff-out
v7
- mention $(TARGET_NAME) when skipping
---
tests/tcg/Makefile | 13 ++++++++++---
tests/tcg/aarch64/Makefile.target | 6 ++----
tests/tcg/arm/Makefile.target | 6 ++----
tests/tcg/i386/Makefile.target | 10 ++++------
tests/tcg/multiarch/Makefile.target | 4 ++--
5 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile
index e7dbcdb5bf..bf06415390 100644
--- a/tests/tcg/Makefile
+++ b/tests/tcg/Makefile
@@ -34,6 +34,15 @@
quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1))
+# $1 = test name, $2 = cmd, $3 = desc
+run-test = $(call quiet-command, timeout $(TIMEOUT) $2 > $1.out,"TEST",$3)
+
+# $1 = test name, $2 = reference
+diff-out = $(call quiet-command, diff -u $1.out $2 | head -n 10,"DIFF","$1.out
with $2")
+
+# $1 = test name, $2 = reason
+skip-test = @printf " SKIPPED %s on $(TARGET_NAME) because %s\n" $1 $2
+
# Tests we are building
TESTS=
@@ -84,9 +93,7 @@ RUN_TESTS=$(patsubst %,run-%, $(TESTS))
RUN_TESTS+=$(EXTRA_RUNS)
run-%: %
- $(call quiet-command, \
- timeout $(TIMEOUT) $(QEMU) $< > $<.out, \
- "TEST", "$< on $(TARGET_NAME)")
+ $(call run-test, $<, $(QEMU) $<, "$< on $(TARGET_NAME)")
.PHONY: run
run: $(RUN_TESTS)
diff --git a/tests/tcg/aarch64/Makefile.target
b/tests/tcg/aarch64/Makefile.target
index 7dba32138d..08c45b8470 100644
--- a/tests/tcg/aarch64/Makefile.target
+++ b/tests/tcg/aarch64/Makefile.target
@@ -13,7 +13,5 @@ TESTS:=$(AARCH64_TESTS)
fcvt: LDFLAGS+=-lm
run-fcvt: fcvt
- $(call quiet-command, \
- $(QEMU) $< > fcvt.out && \
- diff -u $(AARCH64_SRC)/fcvt.ref fcvt.out, \
- "TEST", "$< (default) on $(TARGET_NAME)")
+ $(call run-test,$<,$(QEMU) $<, "$< on $(TARGET_NAME)")
+ $(call diff-out,$<,$(AARCH64_SRC)/fcvt.ref)
diff --git a/tests/tcg/arm/Makefile.target b/tests/tcg/arm/Makefile.target
index 14b5435fc6..aa4e4e3782 100644
--- a/tests/tcg/arm/Makefile.target
+++ b/tests/tcg/arm/Makefile.target
@@ -24,10 +24,8 @@ fcvt: LDFLAGS+=-lm
# fcvt: CFLAGS+=-march=armv8.2-a+fp16 -mfpu=neon-fp-armv8
run-fcvt: fcvt
- $(call quiet-command, \
- $(QEMU) $< > fcvt.out && \
- diff -u $(ARM_SRC)/fcvt.ref fcvt.out, \
- "TEST", "$< (default) on $(TARGET_NAME)")
+ $(call run-test,fcvt,$(QEMU) $<,"$< on $(TARGET_NAME)")
+ $(call diff-out,fcvt,$(ARM_SRC)/fcvt.ref)
endif
# On ARM Linux only supports 4k pages
diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target
index cd173363ee..97b7c23cf1 100644
--- a/tests/tcg/i386/Makefile.target
+++ b/tests/tcg/i386/Makefile.target
@@ -31,7 +31,7 @@ test-i386: test-i386.c test-i386-code16.S test-i386-vm86.S
test-i386.h test-i386
# Specialist test runners
run-runcom: runcom pi_10.com
- $(call quiet-command, $(QEMU) ./runcom $(I386_SRC)/pi_10.com >
runcom.out, "TEST", "$< on $(TARGET_NAME)")
+ $(call run-test,$<,$(QEMU) ./runcom $(I386_SRC)/pi_10.com,"$< on
$(TARGET_NAME)")
ifeq ($(SPEED), slow)
@@ -40,13 +40,11 @@ test-i386-fprem.ref: test-i386-fprem
run-test-i386-fprem: TIMEOUT=60
run-test-i386-fprem: test-i386-fprem
- $(call quiet-command, \
- $(QEMU) $< > $<.out && \
- diff -u $(I386_SRC)/$<.ref $<.out, \
- "TEST", "$< (default) on $(TARGET_NAME)")
+ $(call run-test,test-i386-fprem, $(QEMU) $<,"$< on $(TARGET_NAME)")
+ $(call diff-out,test-i386-fprem, $(I386_SRC)/$<.ref)
else
run-test-i386-fprem: test-i386-fprem
- $(call quiet-command, /bin/true, "SLOW TEST", "$< SKIPPED on
$(TARGET_NAME)")
+ $(call skip-test, $<, "SLOW")
endif
# On i386 and x86_64 Linux only supports 4k pages (large pages are a different
hack)
diff --git a/tests/tcg/multiarch/Makefile.target
b/tests/tcg/multiarch/Makefile.target
index 90e45a881e..b77084c146 100644
--- a/tests/tcg/multiarch/Makefile.target
+++ b/tests/tcg/multiarch/Makefile.target
@@ -27,10 +27,10 @@ testthread: LDFLAGS+=-lpthread
# default case (host page size)
run-test-mmap: test-mmap
- $(call quiet-command, $(QEMU) $< > test-mmap.out, "TEST", \
+ $(call run-test, test-mmap, $(QEMU) $<, \
"$< (default) on $(TARGET_NAME)")
# additional page sizes (defined by each architecture adding to EXTRA_RUNS)
run-test-mmap-%: test-mmap
- $(call quiet-command, $(QEMU) -p $* $< > test-mmap-$*.out, "TEST", \
+ $(call run-test, test-mmap-$*, $(QEMU) -p $* $<,\
"$< ($* byte pages) on $(TARGET_NAME)")
--
2.17.1
- [Qemu-devel] [PATCH v7 17/54] tests/tcg/i386: fix test-i386, (continued)
- [Qemu-devel] [PATCH v7 17/54] tests/tcg/i386: fix test-i386, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 39/54] tests/tcg: enable building for mips64, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 29/54] tests/docker/Makefile.include: fix mipsel-cross dependancy, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 51/54] tests/Makefile: call sub-makes with SKIP_DOCKER_BUILD=1, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 32/54] tests/tcg: enable building for ppc64, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 35/54] tests/tcg: enable building for HPPA, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 44/54] Makefile.target: add (clean-/build-)guest-tests targets, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 24/54] tests/tcg/arm: fix up test-arm-iwmmxt test, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 34/54] tests/tcg/alpha: add Alpha specific tests, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 46/54] tests/tcg: add run, diff, and skip helper macros,
Alex Bennée <=
- [Qemu-devel] [PATCH v7 13/54] tests/tcg/multiarch: move most output to stdout, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 50/54] docker: docker.py add check sub-command, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 36/54] tests/tcg: enable building for m68k, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 27/54] tests/tcg: move MIPS specific tests into subdir, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 14/54] tests/tcg: move i386 specific tests into subdir, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 38/54] tests/tcg: enable building for sparc64, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 52/54] docker: docker.py adding age check command, Alex Bennée, 2018/06/15