Merge

Lib/test/test_gdb.py

@@ -127,6 +127,9 @@ class DebuggerTests(unittest.TestCase):
                           " inferior's thread library, thread debugging will"
                           " not be available.\n",
                           '')
+        err = err.replace("warning: Cannot initialize thread debugging"
+                          " library: Debugger service failed\n",
+                          '')
 
         # Ensure no unexpected error messages:
         self.assertEqual(err, '')