62d7207dd0
* Mon Aug 13 2012 David Malcolm <dmalcolm@redhat.com> - 3.3.0-0.3.b2 - 3.3b1 -> 3.3b2; drop upstreamed patch 152; refresh patches 3, 102, 111, 134, 153, 160; regenenerate autotools patch; rework systemtap patch to work correctly when LANG=C (patch 55); importlib.test was moved to test.test_importlib upstream
38 lines
1.9 KiB
Diff
38 lines
1.9 KiB
Diff
diff -up cpython-59223da36dec/Lib/test/test_gdb.py.fix-test_gdb-noise cpython-59223da36dec/Lib/test/test_gdb.py
|
|
--- cpython-59223da36dec/Lib/test/test_gdb.py.fix-test_gdb-noise 2012-08-07 06:10:57.000000000 -0400
|
|
+++ cpython-59223da36dec/Lib/test/test_gdb.py 2012-08-07 17:13:46.592343113 -0400
|
|
@@ -115,6 +115,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
|
|
@@ -154,8 +163,16 @@ class DebuggerTests(unittest.TestCase):
|
|
err = err.replace("warning: Cannot initialize thread debugging"
|
|
" library: Debugger service failed\n",
|
|
'')
|
|
-
|
|
+ err = '\n'.join([line
|
|
+ for line in err.splitlines()
|
|
+ if not line.startswith('warning: Unable to open')
|
|
+ if not line.startswith('Missing separate debuginfo for')
|
|
+ if not line.startswith('Try: yum --disablerepo=')
|
|
+ # In case 'set print entry-values no' failed:
|
|
+ if not line.startswith('Undefined set print command')])
|
|
+
|
|
# Ensure no unexpected error messages:
|
|
+ self.maxDiff = None
|
|
self.assertEqual(err, '')
|
|
return out
|
|
|