churchyard / rpms / python3

Forked from rpms/python3 6 years ago
Clone

Blame 00196-test-gdb-match-addr-before-builtin.patch

Matej Stuchlik da57024
Subject: python3.test gdb match addr before builtin
Matej Stuchlik da57024
From: Michel Normand <normand@linux.vnet.ibm.com>
Matej Stuchlik da57024
Matej Stuchlik da57024
For ppc64le archi and python3... and gdb... versions
Matej Stuchlik da57024
the test_gdb.py need a change of re.match to handle address before the builtin_id word.
Matej Stuchlik da57024
Of course there is no error if this substring is not present.
Matej Stuchlik da57024
===
Matej Stuchlik da57024
...
Matej Stuchlik da57024
#0  0x00003fffb7dd0898 in builtin_id (self=<module at remote 0x3fffb7901440>, v=<unknown at remote 0x3fffb7f68910>) at /builddir/build/BUILD/Python-3.3.2/Python/bltinmodule.c:966
Matej Stuchlik da57024
....xxxxxxxxxxxxxxxxxxxxxx <= added regexp
Matej Stuchlik da57024
===
Matej Stuchlik da57024
Matej Stuchlik da57024
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
Matej Stuchlik da57024
---
Matej Stuchlik da57024
 Lib/test/test_gdb.py |    2 +-
Matej Stuchlik da57024
 1 file changed, 1 insertion(+), 1 deletion(-)
Matej Stuchlik da57024
Matej Stuchlik da57024
Index: Python-3.3.2/Lib/test/test_gdb.py
Matej Stuchlik da57024
===================================================================
Matej Stuchlik da57024
--- Python-3.3.2.orig/Lib/test/test_gdb.py
Matej Stuchlik da57024
+++ Python-3.3.2/Lib/test/test_gdb.py
Matej Stuchlik da57024
@@ -230,7 +230,7 @@ class DebuggerTests(unittest.TestCase):
Matej Stuchlik da57024
         # gdb can insert additional '\n' and space characters in various places
Matej Stuchlik da57024
         # in its output, depending on the width of the terminal it's connected
Matej Stuchlik da57024
         # to (using its "wrap_here" function)
Matej Stuchlik da57024
-        m = re.match('.*#0\s+builtin_id\s+\(self\=.*,\s+v=\s*(.*?)\)\s+at\s+\S*Python/bltinmodule.c.*',
Matej Stuchlik da57024
+        m = re.match('.*#0\s+(?: 0x[0-9a-f]+\s+in\s+)?builtin_id\s+\(self\=.*,\s+v=\s*(.*?)\)\s+at\s+\S*Python/bltinmodule.c.*',
Matej Stuchlik da57024
                      gdb_output, re.DOTALL)
Matej Stuchlik da57024
         if not m:
Matej Stuchlik da57024
             self.fail('Unexpected gdb output: %r\n%s' % (gdb_output, gdb_output))