Run debug tests from main Makefile.

diff --git a/Makefile.in b/Makefile.in
index 62a95b24bab9bdbdba5099b9206bc19d0d6130fb..d2b088e85efe53a5d66abb62e7b6663b84c21f64 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,8 +4,9 @@ XLEN            := @XLEN@
 instbasedir     := $(DESTDIR)$(prefix)
 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
+all: benchmarks isa debug
 
 install: all
        install -d $(instbasedir)/share/riscv-tests/isa
@@ -21,9 +22,14 @@ isa:
        mkdir -p isa
        $(MAKE) -C isa -f $(isa_src_dir)/Makefile src_dir=$(isa_src_dir) XLEN=$(XLEN)
 
+debug:
+       mkdir -p debug
+       $(MAKE) -C debug -f $(debug_src_dir)/Makefile src_dir=$(debug_src_dir) XLEN=$(XLEN)
+
 clean:
        $(MAKE) -C isa -f $(isa_src_dir)/Makefile src_dir=$(isa_src_dir) clean
        $(MAKE) -C benchmarks -f $(bmarkdir)/Makefile src_dir=$(bmarkdir) clean
+       $(MAKE) -C debug -f $(bmarkdir)/Makefile src_dir=$(debug_src_dir) clean
 
 .PHONY: benchmarks isa clean
 

diff --git a/debug/Makefile b/debug/Makefile
index 62d787505b1d52de76f2f7d5871e2f611d753d68..1d90e122895cef3c194ace4aa2e912e9e3e67ac6 100644 (file)
--- a/debug/Makefile
+++ b/debug/Makefile
@@ -1,12 +1,18 @@
 RISCV_SIM ?= spike
+XLEN ?= 64
+
+src_dir ?= .
+GDBSERVER_PY = $(src_dir)/gdbserver.py
+
+default:       spike$(XLEN).log
 
 all:   spike32.log spike64.log
 
 spike32.log:
-       ./gdbserver.py --isolate --spike32 --cmd $(RISCV_SIM) -- -v > $@ 2>&1
+       $(GDBSERVER_PY) --isolate --spike32 --cmd $(RISCV_SIM) -- -v > $@ 2>&1
 
 spike64.log:
-       ./gdbserver.py --isolate --spike --cmd $(RISCV_SIM) -- -v > $@ 2>&1
+       $(GDBSERVER_PY) --isolate --spike --cmd $(RISCV_SIM) -- -v > $@ 2>&1
 
 clean:
        rm -f *.log