flush spike log after initial write.

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

diff --git a/debug/testlib.py b/debug/testlib.py
index 53e670ec51c006fa96cbb0ea2f201e5f77fb7f7c..e9b17d0283bdeb253cab412a24c31907f567f455 100644 (file)
--- a/debug/testlib.py
+++ b/debug/testlib.py
@@ -65,6 +65,7 @@ class Spike(object):
             cmd.append(binary)
         logfile = open("spike.log", "w")
         logfile.write("+ %s\n" % " ".join(cmd))
+        logfile.flush()
         self.process = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=logfile,
                 stderr=logfile)
 
@@ -79,7 +80,7 @@ class Spike(object):
         return self.process.wait(*args, **kwargs)
 
 class Openocd(object):
-    def __init__(self, cmd=None, config=None, debug=True):
+    def __init__(self, cmd=None, config=None, debug=False):
         if cmd:
             cmd = shlex.split(cmd)
         else:
@@ -89,6 +90,7 @@ class Openocd(object):
         if debug:
             cmd.append("-d")
         logfile = open("openocd.log", "w")
+        logfile.write("+ %s\n" % " ".join(cmd))
         self.process = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=logfile,
                 stderr=logfile)
         # TODO: Pick a random port
@@ -102,10 +104,11 @@ class Openocd(object):
             pass
 
 class Gdb(object):
-    def __init__(self):
-        path = os.path.expandvars("$RISCV/bin/riscv64-unknown-elf-gdb")
+    def __init__(self,
+            path=os.path.expandvars("$RISCV/bin/riscv64-unknown-elf-gdb")):
         self.child = pexpect.spawn(path)
         self.child.logfile = file("gdb.log", "w")
+        self.child.logfile.write("+ %s\n" % path)
         self.wait()
         self.command("set confirm off")
         self.command("set width 0")
@@ -153,7 +156,7 @@ class Gdb(object):
         return output
 
     def load(self):
-        output = self.command("load")
+        output = self.command("load", timeout=60)
         assert "failed" not in  output
         assert "Transfer rate" in output