[Erp5-report] r40102 luke - /erp5/trunk/buildout/tests/assertSoftware.py

nobody at svn.erp5.org nobody at svn.erp5.org
Tue Nov 9 14:04:07 CET 2010


Author: luke
Date: Tue Nov  9 14:04:07 2010
New Revision: 40102

URL: http://svn.erp5.org?rev=40102&view=rev
Log:
 - more assertions for proper linking

Modified:
    erp5/trunk/buildout/tests/assertSoftware.py

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=40102&r1=40101&r2=40102&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Tue Nov  9 14:04:07 2010
@@ -229,7 +229,7 @@ class AssertApache(unittest.TestCase):
   """Tests for built apache"""
 
   def test_ld_libaprutil1(self):
-    """Checks proper linking"""
+    """Checks proper linking of libaprutil-1.so"""
     elf_dict = readElfAsDict('parts/apache/lib/libaprutil-1.so')
     self.assertEqual(sorted(['libexpat', 'libapr-1', 'librt', 'libcrypt',
       'libpthread', 'libdl', 'libc']), elf_dict['library_list'])
@@ -239,6 +239,27 @@ class AssertApache(unittest.TestCase):
     self.assertEqual(sorted(expected_rpath_list), elf_dict['rpath_list'])
     self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
 
+  def test_ld_libapr1(self):
+    """Checks proper linking of libapr-1.so"""
+    elf_dict = readElfAsDict('parts/apache/lib/libapr-1.so')
+    self.assertEqual(sorted(['librt', 'libcrypt',
+      'libpthread', 'libdl', 'libc']), elf_dict['library_list'])
+    soft_dir = os.path.join(os.path.abspath(os.curdir), 'parts')
+    expected_rpath_list = [os.path.join(soft_dir, software, 'lib') for
+        software in ['zlib', 'openssl']]
+    self.assertEqual(sorted(expected_rpath_list), elf_dict['rpath_list'])
+    self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
+
+  def test_ld_libexpat(self):
+    """Checks proper linking of libexpat.so"""
+    elf_dict = readElfAsDict('parts/apache/lib/libexpat.so')
+    self.assertEqual(sorted(['libc']), elf_dict['library_list'])
+    soft_dir = os.path.join(os.path.abspath(os.curdir), 'parts')
+    expected_rpath_list = [os.path.join(soft_dir, software, 'lib') for
+        software in ['zlib', 'openssl']]
+    self.assertEqual(sorted(expected_rpath_list), elf_dict['rpath_list'])
+    self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
+
   def test_modules(self):
     """Checks for availability of apache modules"""
     required_module_list = getCleanList("""




More information about the Erp5-report mailing list