projects
/
riscv-tests.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3a44725
)
WIP towards multiple gdb instances.
author
Tim Newsome
<tim@sifive.com>
Mon, 7 Aug 2017 22:13:09 +0000
(15:13 -0700)
committer
Tim Newsome
<tim@sifive.com>
Mon, 28 Aug 2017 19:16:39 +0000
(12:16 -0700)
debug/testlib.py
patch
|
blob
|
history
diff --git
a/debug/testlib.py
b/debug/testlib.py
index d6c7f8a0c0dd3b3e545abdb68ba2ffc14a36a940..856b9031e6b0077c97e1f1313ce5c7d32f6f5701 100644
(file)
--- a/
debug/testlib.py
+++ b/
debug/testlib.py
@@
-218,7
+218,13
@@
class Openocd(object):
logfile = open(Openocd.logname, "w")
logfile.write("+ %s\n" % " ".join(cmd))
logfile.flush()
logfile = open(Openocd.logname, "w")
logfile.write("+ %s\n" % " ".join(cmd))
logfile.flush()
- self.process = subprocess.Popen(cmd, stdin=subprocess.PIPE,
+
+ self.ports = []
+ self.port = None
+ self.process = self.start(cmd, logfile)
+
+ def start(self, cmd, logfile):
+ process = subprocess.Popen(cmd, stdin=subprocess.PIPE,
stdout=logfile, stderr=logfile)
try:
stdout=logfile, stderr=logfile)
try:
@@
-233,10
+239,14
@@
class Openocd(object):
m = re.search(r"Listening on port (\d+) for gdb connections",
log)
if m:
m = re.search(r"Listening on port (\d+) for gdb connections",
log)
if m:
- self.port = int(m.group(1))
+ if not self.ports:
+ self.port = int(m.group(1))
+ self.ports.append(int(m.group(1)))
+
+ if "telnet server disabled" in log:
break
break
- if not
self.
process.poll() is None:
+ if not process.poll() is None:
raise Exception(
"OpenOCD exited before completing riscv_examine()")
if not messaged and time.time() - start > 1:
raise Exception(
"OpenOCD exited before completing riscv_examine()")
if not messaged and time.time() - start > 1:
@@
-245,7
+255,7
@@
class Openocd(object):
if (time.time() - start) > timeout:
raise Exception("ERROR: Timed out waiting for OpenOCD to "
"listen for gdb")
if (time.time() - start) > timeout:
raise Exception("ERROR: Timed out waiting for OpenOCD to "
"listen for gdb")
-
+ return process
except Exception:
header("OpenOCD log")
sys.stdout.write(log)
except Exception:
header("OpenOCD log")
sys.stdout.write(log)