ri5cy: Allow gdbserver command override with env variable

This allows an alternative gdbserver command to be used when running the tests. testsuite/ChangeLog: * config/ri5cyverilator.exp (beebs_load): Pick up GDBSERVER_CMD environment variable if set.
mageec · Apr 24, 2019 · 72c7f21 · 72c7f21
1 parent e100569
commit 72c7f21
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-04-24  Edward Jones  <ed.jones@embecosm.com>
+
+	* config/ri5cyverilator.exp (beebs_load): Pick up
+	GDBSERVER_CMD environment variable if set.
+
 2019-04-23  Edward Jones  <ed.jones@embecosm.com>
 
 	* config/ri5cyverilator.exp (beebs_load): Check for

diff --git a/testsuite/config/ri5cyverilator.exp b/testsuite/config/ri5cyverilator.exp
@@ -23,7 +23,13 @@ set_board_info beebs,benchmarks "$env(BENCHMARKS)"
 
 proc beebs_load { file } {
     set GDB riscv32-unknown-elf-gdb
-    set GDB_SERVER riscv32-gdbserver
+    set GDBSERVER_CMD "riscv32-gdbserver -c ri5cy --stdin"
+
+    # Maybe override the gdbserver command with an environment variable
+    if { [llength [array names ::env GDBSERVER_CMD]] > 0 } {
+      set GDBSERVER_CMD $::env(GDBSERVER_CMD)
+      verbose "GDBSERVER_CMD set to $GDBSERVER_CMD"
+    }
 
     # Launch GDB, the target, and start running.
     #
@@ -37,7 +43,7 @@ proc beebs_load { file } {
     # We set all required breakpoints here then begin execution.
     spawn $GDB --interpreter=mi -ex "set height 0" \
       -ex "file $file" \
-      -ex "target remote | $GDB_SERVER -c ri5cy --stdin" \
+      -ex "target remote | $GDBSERVER_CMD" \
       -ex "stepi" \
       -ex "stepi" \
       -ex "load" \