projects / riscv-tests.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Test step over invalid instruction.
[riscv-tests.git] / debug / gdbserver.py
diff --git a/debug/gdbserver.py b/debug/gdbserver.py
index 030b6a17aba70386b8a77fc220a5bcf4e843ef19..f7d8d2ebfb6a83cfed233870b00b34eb25b1f097 100755 (executable)
--- a/debug/gdbserver.py
+++ b/debug/gdbserver.py
@@ -302,10 +302,10 @@ class StepTest(DeleteServer):
 
     def test_step(self):
         main = self.gdb.p("$pc")
 
     def test_step(self):
         main = self.gdb.p("$pc")
-        for expected in (4, 0xc, 0x10, 0x18, 0x14, 0x14):
+        for expected in (4, 8, 0xc, 0x10, 0x18, 0x1c, 0x28, 0x20, 0x2c, 0x2c):
             self.gdb.stepi()
             pc = self.gdb.p("$pc")
             self.gdb.stepi()
             pc = self.gdb.p("$pc")
-            self.assertEqual(pc - main, expected)
+            self.assertEqual("%x" % pc, "%x" % (expected + main))
 
 class RegsTest(DeleteServer):
     def setUp(self):
 
 class RegsTest(DeleteServer):
     def setUp(self):