From 9d474b2ec5d8ee165fd3ec121c617d699ede6083 Mon Sep 17 00:00:00 2001 From: michaelh Date: Sun, 6 May 2001 20:58:05 +0000 Subject: [PATCH] Made it possible to run on other people's machines, changed over to rrz80 for the z80 emu git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@790 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- support/regression/Makefile | 17 ++++++++++++++++- support/regression/ports/z80/spec.mk | 4 +++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/support/regression/Makefile b/support/regression/Makefile index 6dc26b0b..5d596da4 100644 --- a/support/regression/Makefile +++ b/support/regression/Makefile @@ -14,6 +14,18 @@ # re-run. Changing one suite causes just that to be run. Changing # one of the library files should cause all to re-run +# Dependancies: +# * The sdcc-extra package, available from CVS. +# o cvs -d cvs.sdcc.sourceforge.net:/cvsroot/sdcc co sdcc-extra +# o Provides the emulators +# * The gbdk-lib package from gbdk. +# o cvs -d cvs.gbdk.sourceforge.net:/cvsroot/gbdk co gbdk-lib +# o Provildes mul, div, and include files for the z80 tests. +# * python 1.5 or above +# +# The paths below assume that sdcc, sdcc-extra, and gbdk-lib all reside in +# the same directory. + # Old nores: # Starting at the bottom # Set of source test suites @@ -63,9 +75,12 @@ PORT_RESULTS_DIR = $(RESULTS_DIR)/$(PORT) # Each test generates a result log file PORT_RESULTS = $(ALL_TESTS:$(TESTS_DIR)/%.c=$(PORT_RESULTS_DIR)/%.out) +SDCC_DIR = ../.. +SDCC_EXTRA_DIR = ../../../sdcc-extra + # Defaults. Override in spec.mk if required. # Path to SDCC -SDCC = ../../bin/sdcc +SDCC = $(SDCC_DIR)/bin/sdcc # Base flags. SDCCFLAGS = -m$(PORT) # Extension of object intermediate files diff --git a/support/regression/ports/z80/spec.mk b/support/regression/ports/z80/spec.mk index 695a2b29..4dfbcc98 100644 --- a/support/regression/ports/z80/spec.mk +++ b/support/regression/ports/z80/spec.mk @@ -3,6 +3,8 @@ # PENDING: Path to gbdk-lib for stdarg GBDK_LIB = ../../../gbdk-lib +RRZ80 = $(SDCC_EXTRA_DIR)/emu/rrz80/rrz80 + SDCCFLAGS += -I$(GBDK_LIB)/include EXEEXT = .bin @@ -32,5 +34,5 @@ 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 $< > $@ + $(RRZ80) $< > $@ if grep -q FAIL $@; then echo FAILURES in $@; fi -- 2.30.2