diff options
| author | Victor Stinner <vstinner@redhat.com> | 2019-09-26 17:30:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-26 17:30:14 +0200 |
| commit | e6b5ed1fbdbb7b44c7ab2a353fa0bc726b073740 (patch) | |
| tree | f97a4ddcc5f66c701a119c5f8fa4616d41a2fc57 | |
| parent | 5017a645b0be53c4f399ae39ac897539e8416ca6 (diff) | |
| download | cpython-git-e6b5ed1fbdbb7b44c7ab2a353fa0bc726b073740.tar.gz | |
bpo-38239: Fix test_gdb for Link Time Optimization (LTO) (GH-16422) (GH-16426)
(cherry picked from commit 64b4a3a2deabcd4103fac2759a311fe94159b4d1)
| -rw-r--r-- | Lib/test/test_gdb.py | 11 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Tests/2019-09-26-15-48-36.bpo-38239.MfoVzY.rst | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py index 7758e1fcd8..1a9975fb84 100644 --- a/Lib/test/test_gdb.py +++ b/Lib/test/test_gdb.py @@ -252,8 +252,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 diff --git a/Misc/NEWS.d/next/Tests/2019-09-26-15-48-36.bpo-38239.MfoVzY.rst b/Misc/NEWS.d/next/Tests/2019-09-26-15-48-36.bpo-38239.MfoVzY.rst new file mode 100644 index 0000000000..f79da29fa1 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2019-09-26-15-48-36.bpo-38239.MfoVzY.rst @@ -0,0 +1 @@ +Fix test_gdb for Link Time Optimization (LTO) builds. |