More tests

[fw/sdcc] / support / regression / ports / z80 / spec.mk

diff --git a/support/regression/ports/z80/spec.mk b/support/regression/ports/z80/spec.mk
index 695a2b29084ffc1d12cf3e32a1ce65f68fe80685..aafc6f4b6a377c00610e9a213c4dc8a7937123b2 100644 (file)
--- a/support/regression/ports/z80/spec.mk
+++ b/support/regression/ports/z80/spec.mk
@@ -3,7 +3,9 @@
 
 # PENDING: Path to gbdk-lib for stdarg
 GBDK_LIB = ../../../gbdk-lib
-SDCCFLAGS += -I$(GBDK_LIB)/include
+RRZ80 = $(SDCC_EXTRA_DIR)/emu/rrz80/rrz80
+
+SDCCFLAGS += -I$(GBDK_LIB)/include --lesspedantic
 
 EXEEXT = .bin
 
@@ -18,7 +20,7 @@ EXTRAS = fwk/lib/testfwk$(OBJEXT) ports/$(PORT)/support$(OBJEXT) \
 
 # Rule to link into .ihx
 %.ihx: %$(OBJEXT) $(EXTRAS)
-       ../../bin/link-z80 -n -- -b_CODE=0x200 -b_DATA=0x8000 -i $@ $< $(EXTRAS)
+       ../../bin/link-z80 -n -- -b_CODE=0x200 -b_DATA=0x8000 -j -i $@ $< $(EXTRAS)
 
 %$(OBJEXT): %.c fwk/include/*.h
        $(SDCC) $(SDCCFLAGS) -c $<
@@ -32,5 +34,6 @@ EXTRAS = fwk/lib/testfwk$(OBJEXT) ports/$(PORT)/support$(OBJEXT) \
 # PENDING: Path to sdcc-extra
 %.out: %$(EXEEXT)
        mkdir -p `dirname $@`
-       java -cp ../../../sdcc-extra/emu/rose ConsoleZ80 $< > $@
-       if grep -q FAIL $@; then echo FAILURES in $@; fi
+       $(RRZ80) --maxruntime=3 --mapfile=$(<:.bin=.sym) $< > $@
+       -grep -n FAIL $@ /dev/null || true
+