Don't run debug tests as part of build.

Testing is a separate step.

Also fix Issue #64 by adding src_dir to the path to the targets file.

diff --git a/Makefile.in b/Makefile.in
index 681fe641f712f05dde33fcbca624cdb12131f60e..c073655448e7083a96c0d2be45a36471e0926449 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,7 +6,7 @@ bmarkdir        := $(abs_top_src_dir)/benchmarks
 isa_src_dir     := $(abs_top_src_dir)/isa
 debug_src_dir   := $(abs_top_src_dir)/debug
 
-all: benchmarks isa debug-check
+all: benchmarks isa
 
 install: all
        install -d $(instbasedir)/share/riscv-tests/isa
@@ -23,8 +23,7 @@ isa:
        $(MAKE) -C isa -f $(isa_src_dir)/Makefile src_dir=$(isa_src_dir) XLEN=$(XLEN)
 
 debug-check:
-       mkdir -p debug/programs
-       cp -ar $(debug_src_dir)/programs/* debug/programs/
+       mkdir -p debug
        $(MAKE) -C debug -f $(debug_src_dir)/Makefile src_dir=$(debug_src_dir) XLEN=$(XLEN)
 
 clean:

diff --git a/debug/Makefile b/debug/Makefile
index 90ee25c6720e369953e5f7636b74f05065687c43..525cbf12aed6740d26b8fb2e7b4e88d21985a2dc 100644 (file)
--- a/debug/Makefile
+++ b/debug/Makefile
@@ -14,7 +14,7 @@ pylint:
 %.log:
        $(GDBSERVER_PY) \
                --isolate \
-               targets/RISC-V/$(subst .log,.py,$@) \
+               $(src_dir)/targets/RISC-V/$(subst .log,.py,$@) \
                --sim_cmd $(RISCV)/bin/$(RISCV_SIM) \
                --server_cmd $(RISCV)/bin/openocd \
            | tee $@ 2>&1 || (sed s/^/$@:\ / $@ && false)