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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Nov 24 16:52:00 2010
New Revision: 40604

URL: http://svn.erp5.org?rev=40604&view=rev
Log:
use our own ncurses in varnish-2.1.

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

Modified: erp5/trunk/buildout/software-profiles/varnish.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/varnish.cfg?rev=40604&r1=40603&r2=40604&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/varnish.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/varnish.cfg [utf8] Wed Nov 24 16:52:00 2010
@@ -7,6 +7,7 @@ parts =
   varnish-2.1
 
 extends =
+  ../software-profiles/ncurses.cfg
   ../software-profiles/pcre.cfg
   ../software-profiles/patch.cfg
 
@@ -38,3 +39,5 @@ patches =
 environment =
   PATH=${patch:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${pcre:location}/lib/pkgconfig
+  CPPFLAGS =-I${ncurses:location}/include
+  LDFLAGS =-Wl,-rpath -Wl,${ncurses:location}/lib

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=40604&r1=40603&r2=40604&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Wed Nov 24 16:52:00 2010
@@ -1800,6 +1800,47 @@ class AssertW3m(AssertSoftwareMixin):
           ]]
     self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
 
+class AssertVarnish(AssertSoftwareMixin):
+  def test_ld_varnishd(self):
+    elf_dict = readElfAsDict('parts/varnish-2.1/sbin/varnishd')
+    self.assertEqual(sorted([
+      'libc',
+      'libdl',
+      'libm',
+      'libnsl',
+      'libpthread',
+      'libvarnish',
+      'libvarnishcompat',
+      'libvcl',
+      ]),
+        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 [
+          'ncurses',
+          'varnish-2.1',
+          ]]
+    self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
+
+  def test_ld_varnishtop(self):
+    elf_dict = readElfAsDict('parts/varnish-2.1/bin/varnishtop')
+    self.assertEqual(sorted([
+      'libc',
+      'libncurses',
+      'libpthread',
+      'libvarnish',
+      'libvarnishapi',
+      'libvarnishcompat',
+      ]),
+        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 [
+          'ncurses',
+          'varnish-2.1',
+          ]]
+    self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
+
 class AssertElfLinkedInternally(AssertSoftwareMixin):
   def test(self):
     return