traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #21093: Prevent failures of ctypes test_macholib on OS X if a 

copy of libz exists in $HOME/lib or /usr/local/lib.
This commit is contained in:
Ned Deily 2014-03-29 00:08:44 -07:00
parent 9aa00d1cd1
commit c420343c0c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/ctypes/test/test_macholib.py
View File

@ -50,8 +50,11 @@ class MachOTest(unittest.TestCase):
'/usr/lib/libSystem.B.dylib') '/usr/lib/libSystem.B.dylib')
result = find_lib('z') result = find_lib('z')
self.assertTrue(result.startswith('/usr/lib/libz.1')) # Issue #21093: dyld default search path includes $HOME/lib and
self.assertTrue(result.endswith('.dylib')) # /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'), self.assertEqual(find_lib('IOKit'),
'/System/Library/Frameworks/IOKit.framework/Versions/A/IOKit') '/System/Library/Frameworks/IOKit.framework/Versions/A/IOKit')

3
Misc/NEWS
View File

@ -129,6 +129,9 @@ Tests
- Issue #20668: asyncio tests no longer rely on tests.txt file. - Issue #20668: asyncio tests no longer rely on tests.txt file.
(Patch by Vajrasky Kok) (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 Tools/Demos
----------- -----------