Make rv64mi-p-ecall work when U-mode is not present

[riscv-tests.git] / debug / targets.py

diff --git a/debug/targets.py b/debug/targets.py
index 624eb7106d9aa220387c128961dd163dc428b7b5..eb6862bd5670917803f8ee1ff3fff3648e1205fe 100644 (file)
--- a/debug/targets.py
+++ b/debug/targets.py
@@ -60,7 +60,7 @@ class Target(object):
 
     # Timeout waiting for the server to start up. This is different than the
     # GDB timeout, which is how long GDB waits for commands to execute.
-    # The server_timeout is how long this script waits for the Server to be
+    # The server_timeout is how long this script waits for the server to be
     # ready for GDB connections.
     server_timeout_sec = 60
 
@@ -113,7 +113,8 @@ class Target(object):
     def server(self):
         """Start the debug server that gdb connects to, eg. OpenOCD."""
         return testlib.Openocd(server_cmd=self.server_cmd,
-                config=self.openocd_config_path)
+                config=self.openocd_config_path,
+                timeout=self.server_timeout_sec)
 
     def compile(self, hart, *sources):
         binary_name = "%s_%s-%d" % (
@@ -172,7 +173,7 @@ def target(parsed):
     found = []
     for name in dir(module):
         definition = getattr(module, name)
-        if type(definition) == type and issubclass(definition, Target):
+        if isinstance(definition, type) and issubclass(definition, Target):
             found.append(definition)
     assert len(found) == 1, "%s does not define exactly one subclass of " \
             "targets.Target" % parsed.target