Make DownloadTest properly park other harts.

2 files changed, 9 insertions, 5 deletions

diff --git a/debug/gdbserver.py b/debug/gdbserver.py
index 98eb818..dd30a3d 100755
--- a/debug/gdbserver.py
+++ b/debug/gdbserver.py
@@ -830,10 +830,11 @@ class DownloadTest(GdbTest):
 
         self.binary = self.target.compile(self.hart, self.download_c.name,
                 "programs/checksum.c")
-        self.gdb.command("file %s" % self.binary)
+        self.gdb.global_command("file %s" % self.binary)
 
     def test(self):
         self.gdb.load()
+        self.parkOtherHarts()
         self.gdb.command("b _exit")
         self.gdb.c()
         assertEqual(self.gdb.p("status"), self.crc)
diff --git a/debug/testlib.py b/debug/testlib.py
index 0fe0322..0a6c185 100644
--- a/debug/testlib.py
+++ b/debug/testlib.py
@@ -857,10 +857,8 @@ class GdbTest(BaseTest):
         del self.gdb
         BaseTest.classTeardown(self)
 
-class GdbSingleHartTest(GdbTest):
-    def classSetup(self):
-        GdbTest.classSetup(self)
-
+    def parkOtherHarts(self):
+        """Park harts besides the currently selected one in loop_forever()."""
         for hart in self.target.harts:
             # Park all harts that we're not using in a safe place.
             if hart != self.hart:
@@ -868,6 +866,11 @@ class GdbSingleHartTest(GdbTest):
                 self.gdb.p("$pc=loop_forever")
         self.gdb.select_hart(self.hart)
 
+class GdbSingleHartTest(GdbTest):
+    def classSetup(self):
+        GdbTest.classSetup(self)
+        self.parkOtherHarts()
+
 class ExamineTarget(GdbTest):
     def test(self):
         for hart in self.target.harts: