merge 3.2

2012-09-20 23:49:33 -04:00 · 2012-09-20 23:49:33 -04:00 · 61cdcf5d7e
parent 7926af5089 f8a9a837c4
commit 61cdcf5d7e
1 changed files with 5 additions and 0 deletions
--- a/Lib/test/test_gdb.py
+++ b/Lib/test/test_gdb.py
@ -154,6 +154,11 @@ class DebuggerTests(unittest.TestCase):
        err = err.replace("warning: Cannot initialize thread debugging"
                          " library: Debugger service failed\n",
                          '')
+        err = err.replace('warning: Could not load shared library symbols for '
+                          'linux-vdso.so.1.\n'
+                          'Do you need "set solib-search-path" or '
+                          '"set sysroot"?\n',
+                          '')

        # Ensure no unexpected error messages:
        self.assertEqual(err, '')