--- Lib/test/test_gdb.py.old	2012-04-11 21:04:01.367073855 -0400
+++ Lib/test/test_gdb.py	2012-04-12 08:52:58.320288761 -0400
@@ -96,6 +96,15 @@ class DebuggerTests(unittest.TestCase):
         # Generate a list of commands in gdb's language:
         commands = ['set breakpoint pending yes',
                     'break %s' % breakpoint,
+
+                    # GDB as of Fedora 17 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',
+
                     'run']
         if cmds_after_breakpoint:
             commands += cmds_after_breakpoint
--- Lib/test/test_gdb.py.old	2012-04-11 21:04:01.367073855 -0400
+++ Lib/test/test_gdb.py	2012-04-12 08:52:58.320288761 -0400
@@ -144,6 +153,10 @@
             'Do you need "set solib-search-path" or '
             '"set sysroot"?',
             )
+        ignore_patterns += ('warning: Unable to open',
+                            'Missing separate debuginfo for',
+                            'Try: yum --disablerepo=',
+                            'Undefined set print command')
         for line in errlines:
             if not line.startswith(ignore_patterns):
                 unexpected_errlines.append(line)