Show the debug logs to stdout, to avoid travis timeouts

[riscv-tests.git] / debug / Makefile

diff --git a/debug/Makefile b/debug/Makefile
index 1916bdaa964012ae4a7bcfca2abddfe8aeef9ad3..f835507ce98df6e7c986335917a4adedd2a791f9 100644 (file)
--- a/debug/Makefile
+++ b/debug/Makefile
@@ -1,27 +1,10 @@
 RISCV_SIM ?= spike
 XLEN ?= 64
 
-OPENOCD_INSTALL ?= $(abspath .)/openocd-install
-OPENOCD_VERSION = 860b42a3c4f6aa37d8d4fe50a71000b7cff66b85
-
-OPENOCD_DIR = $(OPENOCD_INSTALL)_$(OPENOCD_VERSION)/
-
-$(OPENOCD_DIR)/bin/openocd:
-       rm -rf riscv-openocd
-       git clone http://github.com/riscv/riscv-openocd.git
-       cd riscv-openocd ; \
-       git checkout $(OPENOCD_VERSION) ; \
-       ./bootstrap ; \
-       ./configure --enable-remote_bitbang --prefix=$(OPENOCD_INSTALL)_$(OPENOCD_VERSION) --disable-werror; \
-       make ; \
-       make install
-
-install_openocd: $(OPENOCD_DIR)/bin/openocd
-
 src_dir ?= .
 GDBSERVER_PY = $(src_dir)/gdbserver.py
 
-default:       spike$(XLEN).log
+default: spike$(XLEN).log
 
 all:   pylint spike32.log spike64.log
 
@@ -29,8 +12,12 @@ pylint:
        pylint --rcfile=pylint.rc *.py
 
 %.log:
-       $(GDBSERVER_PY) --isolate --$(subst .log,,$@) --server_cmd $(OPENOCD_DIR)/bin/openocd \
-           > $@ 2>&1 || (sed s/^/$@:\ / $@ && false)
+       $(GDBSERVER_PY) \
+               --isolate \
+               --$(subst .log,,$@) \
+               --sim_cmd $(RISCV)/bin/$(RISCV_SIM) \
+               --server_cmd $(RISCV)/bin/openocd \
+           | tee $@ 2>&1 || (sed s/^/$@:\ / $@ && false)
 
 clean:
        rm -f *.log *.pyc