aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdebug/gdbserver.py12
-rw-r--r--debug/programs/semihosting.c2
-rw-r--r--debug/testlib.py1
3 files changed, 4 insertions, 11 deletions
diff --git a/debug/gdbserver.py b/debug/gdbserver.py
index a61722d..ac7b162 100755
--- a/debug/gdbserver.py
+++ b/debug/gdbserver.py
@@ -521,10 +521,7 @@ class DebugTest(GdbSingleHartTest):
self.gdb.b("_exit")
def exit(self, expected_result=0xc86455d4):
- output = self.gdb.c()
- assertIn("Breakpoint", output)
- assertIn("_exit", output)
- assertEqual(self.gdb.p("status"), expected_result)
+ super().exit(expected_result)
class DebugCompareSections(DebugTest):
def test(self):
@@ -944,13 +941,6 @@ class Semihosting(GdbSingleHartTest):
self.parkOtherHarts()
self.gdb.b("_exit")
- def exit(self, expected_result=0):
- output = self.gdb.c()
- assertIn("Breakpoint", output)
- assertIn("_exit", output)
- assertEqual(self.gdb.p("status"), expected_result)
- return output
-
def test(self):
with tempfile.NamedTemporaryFile(suffix=".data") as temp:
self.gdb.b("main:begin")
diff --git a/debug/programs/semihosting.c b/debug/programs/semihosting.c
index ea3fdde..10f3c01 100644
--- a/debug/programs/semihosting.c
+++ b/debug/programs/semihosting.c
@@ -72,4 +72,6 @@ begin:
fd = open(filename, O_WRONLY, 0644);
write(fd, message, strlen(message));
write(1, message2, strlen(message2));
+
+ return 10;
}
diff --git a/debug/testlib.py b/debug/testlib.py
index d2e587b..27deb3a 100644
--- a/debug/testlib.py
+++ b/debug/testlib.py
@@ -1267,6 +1267,7 @@ class GdbTest(BaseTest):
assertIn("Breakpoint", output)
assertIn("_exit", output)
assertEqual(self.gdb.p("status"), expected_result)
+ return output
class GdbSingleHartTest(GdbTest):
def classSetup(self):