From: Tim Newsome <tim@sifive.com>
Date: Thu, 10 Aug 2017 21:23:29 +0000 (-0700)
Subject: Don't run debug tests as part of build.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b6e0c83dbbb4041da325097d5e3b6a592bd2b812;p=riscv-tests.git

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 681fe64..c073655 100644
--- 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 90ee25c..525cbf1 100644
--- 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)