Commit 72cdb054 authored by Łukasz Nowak's avatar Łukasz Nowak

- mysql 5.0 tritonn is linked against own version of readline


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40118 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 9fc59147
...@@ -136,7 +136,7 @@ class AssertMysql50Tritonn(unittest.TestCase): ...@@ -136,7 +136,7 @@ class AssertMysql50Tritonn(unittest.TestCase):
'libssl', 'libstdc++', 'libz']), elf_dict['library_list']) 'libssl', 'libstdc++', 'libz']), 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 ['ncurses', 'zlib', 'senna', 'openssl']] software in ['ncurses', 'zlib', 'senna', 'readline', 'openssl']]
self.assertEqual(sorted(expected_rpath_list), elf_dict['rpath_list']) self.assertEqual(sorted(expected_rpath_list), elf_dict['rpath_list'])
self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list']) self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
...@@ -147,7 +147,7 @@ class AssertMysql50Tritonn(unittest.TestCase): ...@@ -147,7 +147,7 @@ class AssertMysql50Tritonn(unittest.TestCase):
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 ['ncurses', 'zlib', 'openssl']] software in ['ncurses', 'zlib', 'readline', 'openssl']]
self.assertEqual(sorted(expected_rpath_list), elf_dict['rpath_list']) self.assertEqual(sorted(expected_rpath_list), elf_dict['rpath_list'])
self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list']) self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
...@@ -158,7 +158,7 @@ class AssertMysql50Tritonn(unittest.TestCase): ...@@ -158,7 +158,7 @@ class AssertMysql50Tritonn(unittest.TestCase):
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 ['ncurses', 'zlib', 'openssl']] software in ['ncurses', 'zlib', 'readline', 'openssl']]
self.assertEqual(sorted(expected_rpath_list), elf_dict['rpath_list']) self.assertEqual(sorted(expected_rpath_list), elf_dict['rpath_list'])
self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list']) self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
...@@ -169,7 +169,7 @@ class AssertMysql50Tritonn(unittest.TestCase): ...@@ -169,7 +169,7 @@ class AssertMysql50Tritonn(unittest.TestCase):
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 ['ncurses', 'zlib', 'openssl']] software in ['ncurses', 'zlib', 'readline', 'openssl']]
self.assertEqual(sorted(expected_rpath_list), elf_dict['rpath_list']) self.assertEqual(sorted(expected_rpath_list), elf_dict['rpath_list'])
self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list']) self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
...@@ -180,7 +180,7 @@ class AssertMysql50Tritonn(unittest.TestCase): ...@@ -180,7 +180,7 @@ class AssertMysql50Tritonn(unittest.TestCase):
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 ['ncurses', 'zlib', 'openssl']] software in ['ncurses', 'zlib', 'readline', 'openssl']]
self.assertEqual(sorted(expected_rpath_list), elf_dict['rpath_list']) self.assertEqual(sorted(expected_rpath_list), elf_dict['rpath_list'])
self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list']) self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
......
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