diff options
| author | Tim Newsome <tim@sifive.com> | 2023-07-24 09:15:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-24 09:15:07 -0700 |
| commit | d4eaa5bd6674b51d3b9b24913713c4638e99cdd9 (patch) | |
| tree | 8be1054b88f3409bae7cf0444fc72911d64c6786 | |
| parent | 985acb5bdf848b7bdbe372659f0b1d7eaa145c3b (diff) | |
| parent | 83425c3163dfd5d1a2ecb5b2afc3b3309bfd8762 (diff) | |
| download | riscv-tests-d4eaa5bd6674b51d3b9b24913713c4638e99cdd9.zip riscv-tests-d4eaa5bd6674b51d3b9b24913713c4638e99cdd9.tar.gz riscv-tests-d4eaa5bd6674b51d3b9b24913713c4638e99cdd9.tar.bz2 | |
Merge pull request #497 from riscv-software-src/unavailable
debug: Re-enable unavailable tests, and fix them for github
| -rwxr-xr-x | debug/gdbserver.py | 15 | ||||
| -rw-r--r-- | debug/testlib.py | 2 |
2 files changed, 7 insertions, 10 deletions
diff --git a/debug/gdbserver.py b/debug/gdbserver.py index 3b9a661..5a2ba2a 100755 --- a/debug/gdbserver.py +++ b/debug/gdbserver.py @@ -1816,10 +1816,9 @@ class UnavailableMultiTest(GdbTest): "-DDEFINE_FREE") def early_applicable(self): - return False # This test fails in github workflows - #return (self.hart.support_cease or - # self.target.support_unavailable_control) \ - # and len(self.target.harts) > 1 + return (self.hart.support_cease or + self.target.support_unavailable_control) \ + and len(self.target.harts) > 1 def setup(self): ProgramTest.setup(self) @@ -1886,9 +1885,8 @@ class UnavailableRunTest(ProgramTest): """Test that we work correctly when the hart we're debugging ceases to respond.""" def early_applicable(self): - return False # This test fails in github workflows - #return self.hart.support_cease or \ - # self.target.support_unavailable_control + return self.hart.support_cease or \ + self.target.support_unavailable_control def test(self): self.gdb.b("main") @@ -1924,8 +1922,7 @@ class UnavailableCycleTest(ProgramTest): """Test that harts can be debugged after becoming temporarily unavailable.""" def early_applicable(self): - return False # This test fails in github workflows - #return self.target.support_unavailable_control + return self.target.support_unavailable_control def test(self): self.gdb.b("main") diff --git a/debug/testlib.py b/debug/testlib.py index 63cc49c..435b41b 100644 --- a/debug/testlib.py +++ b/debug/testlib.py @@ -432,7 +432,7 @@ class Openocd: self.command_count += 1 self.process.stdin.write(magic + b"\n") self.process.stdin.flush() - m = self.expect(rb"(.*)^> " + re.escape(magic)) + m = self.expect(rb"(.*)^>\s*" + re.escape(magic)) return m.group(1) def expect(self, regex, message=None): |