aboutsummaryrefslogtreecommitdiff
path: root/tests/tcg
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2018-05-21 10:38:37 +0100
committerAlex Bennée <alex.bennee@linaro.org>2018-06-20 20:22:34 +0100
commit607bf9b5a5245563a80cb9484f2fd85d58c46fdc (patch)
tree929327d71eae2409a588c6729fc69d7d320ba6b0 /tests/tcg
parent8ba0a8206a3f7b9870890c99d3222eceffd018a9 (diff)
tests/tcg: add run, diff, and skip helper macros
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 <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Diffstat (limited to 'tests/tcg')
-rw-r--r--tests/tcg/Makefile13
-rw-r--r--tests/tcg/aarch64/Makefile.target6
-rw-r--r--tests/tcg/arm/Makefile.target6
-rw-r--r--tests/tcg/i386/Makefile.target10
-rw-r--r--tests/tcg/multiarch/Makefile.target4
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)")