diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-09-26 15:13:39 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-26 15:13:39 (GMT) |
| commit | c9893400652f38804aed0be8d8f70feda9465c47 (patch) | |
| tree | 2601522b10252613e43f0d2ad154a61075edb092 /Lib/test | |
| parent | 96c8475362acb41decd1d7db9243f328973e5de7 (diff) | |
| download | cpython-c9893400652f38804aed0be8d8f70feda9465c47.zip cpython-c9893400652f38804aed0be8d8f70feda9465c47.tar.gz cpython-c9893400652f38804aed0be8d8f70feda9465c47.tar.bz2 | |
bpo-38239: Fix test_gdb for Link Time Optimization (LTO) (GH-16422)
(cherry picked from commit 64b4a3a2deabcd4103fac2759a311fe94159b4d1)
Co-authored-by: Victor Stinner <vstinner@redhat.com>
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_gdb.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py index e07d327..e106033 100644 --- a/Lib/test/test_gdb.py +++ b/Lib/test/test_gdb.py @@ -255,8 +255,15 @@ class DebuggerTests(unittest.TestCase): # gdb can insert additional '\n' and space characters in various places # in its output, depending on the width of the terminal it's connected # to (using its "wrap_here" function) - m = re.match(r'.*#0\s+builtin_id\s+\(self\=.*,\s+v=\s*(.*?)?\)\s+at\s+\S*Python/bltinmodule.c.*', - gdb_output, re.DOTALL) + m = re.search( + # Match '#0 builtin_id(self=..., v=...)' + r'#0\s+builtin_id\s+\(self\=.*,\s+v=\s*(.*?)?\)' + # Match ' at Python/bltinmodule.c'. + # bpo-38239: builtin_id() is defined in Python/bltinmodule.c, + # but accept any "Directory\file.c" to support Link Time + # Optimization (LTO). + r'\s+at\s+\S*[A-Za-z]+/[A-Za-z0-9_-]+\.c', + gdb_output, re.DOTALL) if not m: self.fail('Unexpected gdb output: %r\n%s' % (gdb_output, gdb_output)) return m.group(1), gdb_output |