diff options
| author | Tim Newsome <tim@sifive.com> | 2017-08-15 15:32:24 -0700 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2017-08-28 12:16:39 -0700 |
| commit | b8646a70258674f7de88145dbd2a7ab8938b77ae (patch) | |
| tree | 23831962cc8889f1623c7d49b0f75b77e2575265 | |
| parent | 4ea3f0be40f1ed31dabfc060865d5af863106cfe (diff) | |
| download | riscv-tests-b8646a70258674f7de88145dbd2a7ab8938b77ae.zip riscv-tests-b8646a70258674f7de88145dbd2a7ab8938b77ae.tar.gz riscv-tests-b8646a70258674f7de88145dbd2a7ab8938b77ae.tar.bz2 | |
Fix rebase bug.
| -rw-r--r-- | debug/testlib.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/debug/testlib.py b/debug/testlib.py index 8ef50e6..692afb6 100644 --- 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): + self.timeout = timeout + 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 (time.time() - start) > timeout: + if (time.time() - start) > self.timeout: raise Exception("ERROR: Timed out waiting for OpenOCD to " "listen for gdb") return process |