From: Tim Newsome <tim@sifive.com>
Date: Tue, 15 Aug 2017 22:32:24 +0000 (-0700)
Subject: Fix rebase bug.
X-Git-Url: https://git.libre-soc.org/?p=riscv-tests.git;a=commitdiff_plain;h=b8646a70258674f7de88145dbd2a7ab8938b77ae

Fix rebase bug.
---

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