summaryrefslogtreecommitdiff
path: root/tests/tcg/i386
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/i386
parent8ba0a8206a3f7b9870890c99d3222eceffd018a9 (diff)
downloadqemu-607bf9b5a5245563a80cb9484f2fd85d58c46fdc.zip
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/i386')
-rw-r--r--tests/tcg/i386/Makefile.target10
1 files changed, 4 insertions, 6 deletions
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)