From 5b8e3a533560c39eb40b2fb950d2b14caacfaf6a Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Thu, 11 Jun 2020 07:07:39 -0700 Subject: bpo-34401: Fix test_gdb for HP GDB version string (GH-20804) The GDB provided by HPE on HP-UX contains a modified version string. Therefore the tests fail. Adapt the regex to match that string. Patch by Michael Osipov. Co-Authored-by: Michael Osipov (cherry picked from commit b2dca49ca3769cb60713f5c2b43e5d5bbdc1f9c7) Co-authored-by: Victor Stinner --- Lib/test/test_gdb.py | 3 ++- Misc/NEWS.d/next/Tests/2018-08-20-09-38-52.bpo-34401.eGxMPm.rst | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Tests/2018-08-20-09-38-52.bpo-34401.eGxMPm.rst diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py index f043c92..d90ca5a 100644 --- a/Lib/test/test_gdb.py +++ b/Lib/test/test_gdb.py @@ -39,7 +39,8 @@ def get_gdb_version(): # 'GNU gdb (GDB) Fedora 7.9.1-17.fc22\n' -> 7.9 # 'GNU gdb 6.1.1 [FreeBSD]\n' -> 6.1 # 'GNU gdb (GDB) Fedora (7.5.1-37.fc18)\n' -> 7.5 - match = re.search(r"^GNU gdb.*?\b(\d+)\.(\d+)", version) + # 'HP gdb 6.7 for HP Itanium (32 or 64 bit) and target HP-UX 11iv2 and 11iv3.\n' -> 6.7 + match = re.search(r"^(?:GNU|HP) gdb.*?\b(\d+)\.(\d+)", version) if match is None: raise Exception("unable to parse GDB version: %r" % version) return (version, int(match.group(1)), int(match.group(2))) diff --git a/Misc/NEWS.d/next/Tests/2018-08-20-09-38-52.bpo-34401.eGxMPm.rst b/Misc/NEWS.d/next/Tests/2018-08-20-09-38-52.bpo-34401.eGxMPm.rst new file mode 100644 index 0000000..1b28d94 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2018-08-20-09-38-52.bpo-34401.eGxMPm.rst @@ -0,0 +1 @@ +Make test_gdb properly run on HP-UX. Patch by Michael Osipov. -- cgit v0.12