diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-06-11 14:08:29 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-11 14:08:29 (GMT) |
| commit | 2f46c65071c5528ce143bd02786f8fe94fe65d1f (patch) | |
| tree | 314647219a876975694c480b243598e704b8b6ee | |
| parent | 961edf7979ca34d6fe104a1cce005aa8cac35821 (diff) | |
| download | cpython-2f46c65071c5528ce143bd02786f8fe94fe65d1f.zip cpython-2f46c65071c5528ce143bd02786f8fe94fe65d1f.tar.gz cpython-2f46c65071c5528ce143bd02786f8fe94fe65d1f.tar.bz2 | |
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 <michael.osipov@siemens.com>
(cherry picked from commit b2dca49ca3769cb60713f5c2b43e5d5bbdc1f9c7)
Co-authored-by: Victor Stinner <vstinner@python.org>
| -rw-r--r-- | Lib/test/test_gdb.py | 3 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Tests/2018-08-20-09-38-52.bpo-34401.eGxMPm.rst | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py index 210cd0d..22c75ba 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. |