From edfe598fd06366170628e88aa6dee762d2c37bbc Mon Sep 17 00:00:00 2001
From: Tim Newsome <tim@sifive.com>
Date: Tue, 19 Jul 2016 11:07:03 -0700
Subject: [PATCH 1/1] Run debug tests from main Makefile.

---
 Makefile.in    |  8 +++++++-
 debug/Makefile | 10 ++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 62a95b2..d2b088e 100644
--- 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 62d7875..1d90e12 100644
--- 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
-- 
2.30.2