summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-09-03 13:42:45 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-09-03 13:42:45 (GMT)
commitaba2466d09f62610b4cb5d7bf16f145053a8417a (patch)
tree6ffe93b001f426f27b788b10315b4bfdc98e1ec8
parentc2b43d1feab3e77866cfe731624968cb593a23bb (diff)
parent479fea63e1b321a8fe47af1bb62e87f47b6c45c0 (diff)
downloadcpython-aba2466d09f62610b4cb5d7bf16f145053a8417a.zip
cpython-aba2466d09f62610b4cb5d7bf16f145053a8417a.tar.gz
cpython-aba2466d09f62610b4cb5d7bf16f145053a8417a.tar.bz2
Merge 3.4 (test_gdb)
-rw-r--r--Lib/test/test_gdb.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py
index ed8b7b7..db777be 100644
--- a/Lib/test/test_gdb.py
+++ b/Lib/test/test_gdb.py
@@ -36,8 +36,9 @@ def get_gdb_version():
# Regex to parse:
# 'GNU gdb (GDB; SUSE Linux Enterprise 12) 7.7\n' -> 7.7
# 'GNU gdb (GDB) Fedora 7.9.1-17.fc22\n' -> 7.9
- # 'GNU gdb 6.1.1 [FreeBSD]\n'
- match = re.search("^GNU gdb.*? (\d+)\.(\d)", version)
+ # '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)
if match is None:
raise Exception("unable to parse GDB version: %r" % version)
return (version, int(match.group(1)), int(match.group(2)))