diff options
author | Tim Newsome <tim@sifive.com> | 2022-12-01 10:30:11 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-01 10:30:11 -0800 |
commit | 068241464ee28131a811f70bd2a78e299e60af91 (patch) | |
tree | 6889d751e34c36dc45e1081b5d5b53b088da80a0 | |
parent | e9ab2e9502894692302d289a950a08cf2c25db68 (diff) | |
download | riscv-tests-068241464ee28131a811f70bd2a78e299e60af91.zip riscv-tests-068241464ee28131a811f70bd2a78e299e60af91.tar.gz riscv-tests-068241464ee28131a811f70bd2a78e299e60af91.tar.bz2 |
Share exit() among more tests. (#433)
-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 cc054a4..a61722d 100755 --- a/debug/gdbserver.py +++ b/debug/gdbserver.py @@ -466,14 +466,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") @@ -1322,13 +1314,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 8255384..1559d2c 100644 --- a/debug/testlib.py +++ b/debug/testlib.py @@ -1253,6 +1253,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) |