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

nobody at svn.erp5.org nobody at svn.erp5.org
Thu Nov 25 13:10:57 CET 2010


Author: luke
Date: Thu Nov 25 13:10:57 2010
New Revision: 40676

URL: http://svn.erp5.org?rev=40676&view=rev
Log:
 - core and usual list is different

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=40676&r1=40675&r2=40676&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Thu Nov 25 13:10:57 2010
@@ -1599,7 +1599,7 @@ class AssertFile(AssertSoftwareMixin):
       ])
 
 class AssertImagemagick(AssertSoftwareMixin):
-  lib_lib_list = [
+  core_lib_list = [
       'libbz2',
       'libc',
       'libdl',
@@ -1608,14 +1608,22 @@ class AssertImagemagick(AssertSoftwareMi
       'libz',
       ]
 
-  lib_rpath_list = [
+  core_rpath_list = [
       'zlib',
       'bzip2',
       ]
 
+  lib_lib_list = core_lib_list + [
+      'libMagickCore',
+      ]
+
+  lib_rpath_list = core_lib_list + [
+      'imagemagick',
+      ]
+
   def test_ld_libMagickCore(self):
     self.assertLibraryList('parts/imagemagick/lib/libMagickCore.so',
-      self.lib_lib_list, self.lib_rpath_list)
+      self.core_lib_list, self.core_rpath_list)
 
   def test_ld_libMagickWand(self):
     self.assertLibraryList('parts/imagemagick/lib/libMagickWand.so',




More information about the Erp5-report mailing list