Commit d099d61b authored by Łukasz Nowak's avatar Łukasz Nowak

- convert list for diffs friendly


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40545 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent b9c1b22f
...@@ -781,16 +781,39 @@ class AssertSubversion(AssertSoftwareMixin): ...@@ -781,16 +781,39 @@ class AssertSubversion(AssertSoftwareMixin):
def test_ld_libsvn_ra_neon(self): def test_ld_libsvn_ra_neon(self):
elf_dict = readElfAsDict('parts/subversion/lib/libsvn_ra_neon-1.so') elf_dict = readElfAsDict('parts/subversion/lib/libsvn_ra_neon-1.so')
self.assertEqual(sorted(['libaprutil-1', 'libsvn_delta-1', 'libcrypto', self.assertEqual(sorted([
'libexpat', 'libsvn_subr-1', 'libapr-1', 'libuuid', 'libssl', 'libneon', 'libapr-1',
'librt', 'libc', 'libcrypt', 'libdl', 'libpthread', 'libm', 'libxml2', 'libaprutil-1',
'libc',
'libcrypt',
'libcrypto',
'libdl',
'libexpat',
'libm',
'libneon',
'libpthread',
'librt',
'libssl',
'libsvn_delta-1',
'libsvn_subr-1',
'libuuid',
'libxml2',
'libz', 'libz',
]), ]),
elf_dict['library_list']) elf_dict['library_list'])
soft_dir = os.path.join(os.path.abspath(os.curdir), 'parts') soft_dir = os.path.join(os.path.abspath(os.curdir), 'parts')
expected_rpath_list = [os.path.join(soft_dir, software, 'lib') for expected_rpath_list = [os.path.join(soft_dir, software, 'lib') for
software in ['apache', 'libexpat', 'openssl', 'libxml2', software in [
'sqlite3', 'subversion', 'zlib', 'libuuid', 'neon']] 'apache',
'libexpat',
'libuuid',
'libxml2',
'neon',
'openssl',
'sqlite3',
'subversion',
'zlib',
]]
self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list']) self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
def test_ld_libsvn_ra_svn(self): def test_ld_libsvn_ra_svn(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment