RetroSearch Browse

Sat Mar 29 08:10:26 CET 2014 · http://mail.python.org/pipermail/python-checkins/2014-March/129233.html

http://hg.python.org/cpython/rev/33c4c01404cd
changeset:   90025:33c4c01404cd
parent:      90022:a90254be2da2
parent:      90024:831bd1a1cf6c
user:        Ned Deily <nad at acm.org>
date:        Sat Mar 29 00:09:56 2014 -0700
summary:
  Issue #21093: merge from 3.4

files:
  Lib/ctypes/test/test_macholib.py |  7 +++++--
  Misc/NEWS                        |  3 +++
  2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Lib/ctypes/test/test_macholib.py b/Lib/ctypes/test/test_macholib.py
--- a/Lib/ctypes/test/test_macholib.py
+++ b/Lib/ctypes/test/test_macholib.py
@@ -50,8 +50,11 @@
                                  '/usr/lib/libSystem.B.dylib')
 
             result = find_lib('z')
-            self.assertTrue(result.startswith('/usr/lib/libz.1'))
-            self.assertTrue(result.endswith('.dylib'))
+            # Issue #21093: dyld default search path includes $HOME/lib and
+            # /usr/local/lib before /usr/lib, which caused test failures if
+            # a local copy of libz exists in one of them. Now ignore the head
+            # of the path.
+            self.assertRegex(result, r".*/lib/libz\..*.*\.dylib")
 
             self.assertEqual(find_lib('IOKit'),
                                  '/System/Library/Frameworks/IOKit.framework/Versions/A/IOKit')
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -159,6 +159,9 @@
 - Issue #20668: asyncio tests no longer rely on tests.txt file.
   (Patch by Vajrasky Kok)
 
+- Issue #21093: Prevent failures of ctypes test_macholib on OS X if a
+  copy of libz exists in $HOME/lib or /usr/local/lib.
+
 Tools/Demos
 -----------
 

-- 
Repository URL: http://hg.python.org/cpython


Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Showing content from http://mail.python.org/pipermail/python-checkins/2014-March/129233.html below:

[Python-checkins] cpython (merge 3.4 -> default): Issue #21093: merge from 3.4