From 17d337bc7a31cf7d2ed7f8025055b8db3e8dde43 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Fri, 6 Feb 2015 08:35:20 +0200 Subject: [PATCH] Issue #23881: Only use entry-values with gdb 7.4 in tests. Fixes a regression in issue #22765. Patch by Vinson Lee. --- Lib/test/test_gdb.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py index 2db9cd59f92..aaa5c69d49c 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: