Add --gdb-port

[riscv-isa-sim.git] / tests / testlib.py

diff --git a/tests/testlib.py b/tests/testlib.py
index d41c150a72866e56cd8a41e3c2d561ba6eafbfc3..2db25491c433ed3dcdf5678e4009cd9330c6363c 100644 (file)
--- a/tests/testlib.py
+++ b/tests/testlib.py
@@ -25,13 +25,25 @@ def compile(src):
     assert result == 0, "%r failed" % cmd
     return dst
 
+def unused_port():
+    # http://stackoverflow.com/questions/2838244/get-open-tcp-port-in-python/2838309#2838309
+    import socket
+    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    s.bind(("",0))
+    port = s.getsockname()[1]
+    s.close()
+    return port
+
 def spike(binary, halted=False):
+    """Launch spike. Return tuple of its process and the port it's running on."""
     cmd = [find_file("spike")]
     if halted:
         cmd.append('-H')
-    cmd += ['pk', binary]
+    port = unused_port()
+    cmd += ['--gdb-port', str(port), 'pk', binary]
     logfile = open("spike.log", "w")
-    return subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=logfile, stderr=logfile)
+    return subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=logfile,
+            stderr=logfile), port
 
 class Gdb(object):
     def __init__(self):
@@ -54,7 +66,7 @@ class Gdb(object):
 
     def x(self, address, size='w'):
         output = self.command("x/%s %s" % (size, address))
-        value = int(output.split(':')[1].strip())
+        value = int(output.split(':')[1].strip(), 0)
         return value
 
     def p(self, obj):