projects
/
riscv-tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix rebase bug.
[riscv-tests.git]
/
debug
/
testlib.py
diff --git
a/debug/testlib.py
b/debug/testlib.py
index 8ef50e657527138905a34c067823f809a3150810..692afb6f70f2b0587862c4d1ac755e983e6b5799 100644
(file)
--- a/
debug/testlib.py
+++ b/
debug/testlib.py
@@
-185,6
+185,8
@@
class Openocd(object):
print "OpenOCD Temporary Log File: %s" % logname
def __init__(self, server_cmd=None, config=None, debug=False, timeout=60):
print "OpenOCD Temporary Log File: %s" % logname
def __init__(self, server_cmd=None, config=None, debug=False, timeout=60):
+ self.timeout = timeout
+
if server_cmd:
cmd = shlex.split(server_cmd)
else:
if server_cmd:
cmd = shlex.split(server_cmd)
else:
@@
-255,7
+257,7
@@
class Openocd(object):
if not messaged and time.time() - start > 1:
messaged = True
print "Waiting for OpenOCD to start..."
if not messaged and time.time() - start > 1:
messaged = True
print "Waiting for OpenOCD to start..."
- if (time.time() - start) > timeout:
+ if (time.time() - start) >
self.
timeout:
raise Exception("ERROR: Timed out waiting for OpenOCD to "
"listen for gdb")
return process
raise Exception("ERROR: Timed out waiting for OpenOCD to "
"listen for gdb")
return process