diff options
| author | Tim Newsome <tim@sifive.com> | 2017-08-10 14:23:29 -0700 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2017-08-10 14:23:29 -0700 |
| commit | b6e0c83dbbb4041da325097d5e3b6a592bd2b812 (patch) | |
| tree | 91d9a50dbb2b762f5877bc482d7a129309205a27 | |
| parent | d97ba09c601887c57e9ec37234fe76346b25b16d (diff) | |
| download | riscv-tests-b6e0c83dbbb4041da325097d5e3b6a592bd2b812.zip riscv-tests-b6e0c83dbbb4041da325097d5e3b6a592bd2b812.tar.gz riscv-tests-b6e0c83dbbb4041da325097d5e3b6a592bd2b812.tar.bz2 | |
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.
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | debug/Makefile | 2 |
2 files changed, 3 insertions, 4 deletions
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) |