diff options
| author | Tim Newsome <tim@sifive.com> | 2022-11-29 10:47:38 -0800 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2022-11-29 13:18:47 -0800 |
| commit | abc065fa941f67aae994ca72c65405b971f7b72a (patch) | |
| tree | f65cafc26b061e7cac5db014989783b15221f57f | |
| parent | 1f55991268c9851de8024ec973d54d5709bf454b (diff) | |
| download | riscv-tests-abc065fa941f67aae994ca72c65405b971f7b72a.zip riscv-tests-abc065fa941f67aae994ca72c65405b971f7b72a.tar.gz riscv-tests-abc065fa941f67aae994ca72c65405b971f7b72a.tar.bz2 | |
Move exit() into GdbTest().
| -rwxr-xr-x | debug/gdbserver.py | 15 | ||||
| -rw-r--r-- | debug/programs/trigger.S | 2 | ||||
| -rw-r--r-- | debug/testlib.py | 8 |
3 files changed, 9 insertions, 16 deletions
diff --git a/debug/gdbserver.py b/debug/gdbserver.py index 08e8f4f..3cb7f32 100755 --- a/debug/gdbserver.py +++ b/debug/gdbserver.py @@ -467,14 +467,6 @@ class ProgramTest(GdbSingleHartTest): def setup(self): self.gdb.load() - def exit(self, expected_result=10): - self.gdb.command("delete") - self.gdb.b("_exit") - output = self.gdb.c() - assertIn("Breakpoint", output) - assertIn("_exit", output) - assertEqual(self.gdb.p("status"), expected_result) - class ProgramHwWatchpoint(ProgramTest): def test(self): mainbp = self.gdb.b("main") @@ -1323,13 +1315,6 @@ class TriggerTest(GdbSingleHartTest): self.gdb.c() self.gdb.command("delete") - def exit(self): - self.gdb.command("delete") - self.gdb.b("_exit") - output = self.gdb.c() - assertIn("Breakpoint", output) - assertIn("_exit", output) - class TriggerExecuteInstant(TriggerTest): """Test an execute breakpoint on the first instruction executed out of debug mode.""" diff --git a/debug/programs/trigger.S b/debug/programs/trigger.S index 4b3da91..1e8be07 100644 --- a/debug/programs/trigger.S +++ b/debug/programs/trigger.S @@ -60,7 +60,7 @@ clear_triggers: jal write_triggers main_exit: - li a0, 0 + li a0, 10 j _exit write_triggers: diff --git a/debug/testlib.py b/debug/testlib.py index d3fee5c..edb903a 100644 --- a/debug/testlib.py +++ b/debug/testlib.py @@ -1272,6 +1272,14 @@ class GdbTest(BaseTest): # PMP registers are optional pass + def exit(self, expected_result=10): + self.gdb.command("delete") + self.gdb.b("_exit") + output = self.gdb.c() + assertIn("Breakpoint", output) + assertIn("_exit", output) + assertEqual(self.gdb.p("status"), expected_result) + class GdbSingleHartTest(GdbTest): def classSetup(self): GdbTest.classSetup(self) |