From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 6 Feb 2015 06:36:14 +0000 (+0200)
Subject: Issue #23881: Only use entry-values with gdb 7.4 in tests.
X-Git-Tag: v2.7.10rc1~181
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd8430fa64dc3382220cf4e819e4caf9f28e1514;p=thirdparty%2FPython%2Fcpython.git

Issue #23881: Only use entry-values with gdb 7.4 in tests.
Fixes a regression in issue #22765.  Patch by Vinson Lee.
---

diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py
index 948e7ca4e76d..0da1c02aa34a 100644
--- a/Lib/test/test_gdb.py
+++ b/Lib/test/test_gdb.py
@@ -119,14 +119,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
@@ -138,6 +130,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: