summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-02-06 06:35:20 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-02-06 06:35:20 (GMT)
commit17d337bc7a31cf7d2ed7f8025055b8db3e8dde43 (patch)
tree70203757c13117f34f065fdf9e65b7e4a87792e1 /Lib/test
parent50afcc09acf6f51a37261a4542df521f8eafabea (diff)
downloadcpython-17d337bc7a31cf7d2ed7f8025055b8db3e8dde43.zip
cpython-17d337bc7a31cf7d2ed7f8025055b8db3e8dde43.tar.gz
cpython-17d337bc7a31cf7d2ed7f8025055b8db3e8dde43.tar.bz2
Issue #23881: Only use entry-values with gdb 7.4 in tests.
Fixes a regression in issue #22765. Patch by Vinson Lee.
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_gdb.py18
1 files changed, 10 insertions, 8 deletions
diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py
index 2db9cd5..aaa5c69 100644
--- a/Lib/test/test_gdb.py
+++ b/Lib/test/test_gdb.py
@@ -124,14 +124,6 @@ class DebuggerTests(unittest.TestCase):
commands = ['set breakpoint pending yes',
'break %s' % breakpoint,
- # GDB as of 7.4 (?) onwards can distinguish between the
- # value of a variable at entry vs current value:
- # http://sourceware.org/gdb/onlinedocs/gdb/Variables.html
- # which leads to the selftests failing with errors like this:
- # AssertionError: 'v@entry=()' != '()'
- # Disable this:
- 'set print entry-values no',
-
# The tests assume that the first frame of printed
# backtrace will not contain program counter,
# that is however not guaranteed by gdb
@@ -143,6 +135,16 @@ class DebuggerTests(unittest.TestCase):
'set print address off',
'run']
+
+ # GDB as of 7.4 onwards can distinguish between the
+ # value of a variable at entry vs current value:
+ # http://sourceware.org/gdb/onlinedocs/gdb/Variables.html
+ # which leads to the selftests failing with errors like this:
+ # AssertionError: 'v@entry=()' != '()'
+ # Disable this:
+ if (gdb_major_version, gdb_minor_version) >= (7, 4):
+ commands += ['set print entry-values no']
+
if cmds_after_breakpoint:
commands += cmds_after_breakpoint
else: