b0a6ae1
--- Lib/test/test_gdb.py.old	2012-04-11 21:04:01.367073855 -0400
b0a6ae1
+++ Lib/test/test_gdb.py	2012-04-12 08:52:58.320288761 -0400
b0a6ae1
@@ -96,6 +96,15 @@ class DebuggerTests(unittest.TestCase):
b0a6ae1
         # Generate a list of commands in gdb's language:
b0a6ae1
         commands = ['set breakpoint pending yes',
b0a6ae1
                     'break %s' % breakpoint,
b0a6ae1
+
b0a6ae1
+                    # GDB as of Fedora 17 onwards can distinguish between the
b0a6ae1
+                    # value of a variable at entry vs current value:
b0a6ae1
+                    #   http://sourceware.org/gdb/onlinedocs/gdb/Variables.html
b0a6ae1
+                    # which leads to the selftests failing with errors like this:
b0a6ae1
+                    #   AssertionError: 'v@entry=()' != '()'
b0a6ae1
+                    # Disable this:
b0a6ae1
+                    'set print entry-values no',
b0a6ae1
+
b0a6ae1
                     'run']
b0a6ae1
         if cmds_after_breakpoint:
b0a6ae1
             commands += cmds_after_breakpoint
b0a6ae1
@@ -135,8 +144,16 @@ class DebuggerTests(unittest.TestCase):
b0a6ae1
         err = err.replace("warning: Cannot initialize thread debugging"
b0a6ae1
                           " library: Debugger service failed\n",
b0a6ae1
                           '')
b0a6ae1
+        err = '\n'.join([line
b0a6ae1
+                         for line in err.splitlines()
b0a6ae1
+                         if not line.startswith('warning: Unable to open')
b0a6ae1
+                         if not line.startswith('Missing separate debuginfo for')
b0a6ae1
+                         if not line.startswith('Try: yum --disablerepo=')
b0a6ae1
+                         # In case 'set print entry-values no' failed:
b0a6ae1
+                         if not line.startswith('Undefined set print command')])
b0a6ae1
 
b0a6ae1
         # Ensure no unexpected error messages:
b0a6ae1
+        self.maxDiff = None
b0a6ae1
         self.assertEqual(err, '')
b0a6ae1
 
b0a6ae1
         return out