[Erp5-report] r40651 kazuhiko - in /erp5/trunk/buildout: software-profiles/ tests/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Nov 25 11:02:21 2010
New Revision: 40651

URL: http://svn.erp5.org?rev=40651&view=rev
Log:
link wish our own zlib in lxml.

Modified:
    erp5/trunk/buildout/software-profiles/lxml-python.cfg
    erp5/trunk/buildout/tests/assertSoftware.py

Modified: erp5/trunk/buildout/software-profiles/lxml-python.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/lxml-python.cfg?rev=40651&r1=40650&r2=40651&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/lxml-python.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/lxml-python.cfg [utf8] Thu Nov 25 11:02:21 2010
@@ -2,6 +2,7 @@
 extends =
   ../software-profiles/libxml2.cfg
   ../software-profiles/libxslt.cfg
+  ../software-profiles/zlib.cfg
 
 parts =
   lxml-python
@@ -15,4 +16,5 @@ egg = lxml
 rpath =
   ${libxml2:location}/lib/
   ${libxslt:location}/lib/
+  ${zlib:location}/lib/
 environment = lxml-python-env

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=40651&r1=40650&r2=40651&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Thu Nov 25 11:02:21 2010
@@ -106,6 +106,13 @@ def readElfAsDict(f):
     runpath_list=sorted(runpath_list)
   )
 
+def getPythonVersion():
+  return '%s.%s' % util.sys.version_info[0:2]
+
+def getDevelopEggName(name, version):
+  return '%s-%s-py%s-%s.egg' % (name, version, getPythonVersion(),
+                                util.get_platform())
+
 def readLddInfoList(f):
   popen = subprocess.Popen(['ldd', f], stdout=subprocess.PIPE,
       stderr=subprocess.STDOUT)
@@ -1448,10 +1455,9 @@ class AssertBzip2(AssertSoftwareMixin):
 
 class AssertPysvn(AssertSoftwareMixin):
   def test_ld_pysvn(self):
-    python_version_major, python_version_minor = util.sys.version_info[0:2]
-    self.assertLibraryList('develop-eggs/pysvn-1.7.4-py%s.%s-%s.egg/pysvn/_pysvn_%s_%s.so' % (
-      python_version_major, python_version_minor, util.get_platform(),
-      python_version_major, python_version_minor), [
+    self.assertLibraryList('develop-eggs/%s/pysvn/_pysvn_%s.so' % (
+      getDevelopEggName('pysvn', '1.7.4'),
+      getPythonVersion().replace('.', '_')), [
       'libc',
       'libcom_err',
       'libgcc_s',
@@ -1465,6 +1471,41 @@ class AssertPysvn(AssertSoftwareMixin):
       'subversion'
       ])
 
+class AssertLxml(AssertSoftwareMixin):
+  def test_ld_etree_so(self):
+    egg_name = getDevelopEggName('lxml', '2.2.8')
+    python_version_major, python_version_minor = util.sys.version_info[0:2]
+    self.assertLibraryList('develop-eggs/%s/lxml/etree.so' % (egg_name), [
+      'libc',
+      'libexslt',
+      'libm',
+      'libpthread',
+      'libxml2',
+      'libxslt',
+      'libz',
+      ], [
+      'libxml2',
+      'libxslt',
+      'zlib',
+      ])
+
+  def test_ld_objectify_so(self):
+    egg_name = getDevelopEggName('lxml', '2.2.8')
+    python_version_major, python_version_minor = util.sys.version_info[0:2]
+    self.assertLibraryList('develop-eggs/%s/lxml/objectify.so' % (egg_name), [
+      'libc',
+      'libexslt',
+      'libm',
+      'libpthread',
+      'libxml2',
+      'libxslt',
+      'libz',
+      ], [
+      'libxml2',
+      'libxslt',
+      'zlib',
+      ])
+
 class AssertElfLinkedInternally(AssertSoftwareMixin):
   def test(self):
     result_dict = {}