#17833: merge with 3.3

davidmalcolm · davidmalcolm · commit 1df37c657d7b · 2013-05-06T14:51:13.000-04:00
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -215,6 +215,9 @@ Library
 Tests
 -----
 
+- Issue #17833: Fix test_gdb failures seen on machines where debug symbols
+  for glibc are available (seen on PPC64 Linux).
+
 - Issue #7855: Add tests for ctypes/winreg for issues found in IronPython.
   Initial patch by Dino Viehland.
 
diff --git a/Tools/gdb/libpython.py b/Tools/gdb/libpython.py
@@ -1462,7 +1462,7 @@ def is_waiting_for_gil(self):
         # This assumes the _POSIX_THREADS version of Python/ceval_gil.h:
         name = self._gdbframe.name()
         if name:
-            return name.startswith('pthread_cond_timedwait')
+            return 'pthread_cond_timedwait' in name
 
     def is_gc_collect(self):
         '''Is this frame "collect" within the garbage-collector?'''
