zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ph...@apache.org
Subject svn commit: r1302281 - in /zookeeper/trunk: CHANGES.txt build.xml
Date Mon, 19 Mar 2012 06:11:08 GMT
Author: phunt
Date: Mon Mar 19 06:11:07 2012
New Revision: 1302281

URL: http://svn.apache.org/viewvc?rev=1302281&view=rev
Log:
ZOOKEEPER-1384. test-cppunit overrides LD_LIBRARY_PATH and fails if gcc is in non-standard
location (Jay Shrauner via phunt)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/build.xml

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1302281&r1=1302280&r2=1302281&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Mon Mar 19 06:11:07 2012
@@ -159,6 +159,9 @@ BUGFIXES:
   check_priv_sep_dir (Chris Beauchamp via phunt)
 
   ZOOKEEPER-1403. zkCli.sh script quoting issue (James Page via phunt)
+
+  ZOOKEEPER-1384. test-cppunit overrides LD_LIBRARY_PATH and fails if
+  gcc is in non-standard location (Jay Shrauner via phunt)
    
 IMPROVEMENTS:
 

Modified: zookeeper/trunk/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/build.xml?rev=1302281&r1=1302280&r2=1302281&view=diff
==============================================================================
--- zookeeper/trunk/build.xml (original)
+++ zookeeper/trunk/build.xml Mon Mar 19 06:11:07 2012
@@ -410,7 +410,7 @@
       <property name="c.build" value="${build.dir}/c/build"/>
       <exec dir="${build.dir}/c" executable="make" failonerror="true">
         <arg value="install"/>
-        <env key="LD_LIBRARY_PATH" value="${c.build}"/>
+        <env key="LD_LIBRARY_PATH" value="${env.LD_LIBRARY_PATH};${c.build}"/>
         <env key="PATH" path="${env.PATH};${c.src.dir};"/>
         <env key="CALLER" value="ANT"/>
         <env key="base_dir" value="${basedir}"/>
@@ -1270,7 +1270,7 @@
             if="cppunit"
 		description="to run cppunit test cases">
         <exec dir="${test.cppunit.dir}" executable="make" failonerror="true">
-		<env key="LD_LIBRARY_PATH" value="${cppunit.lib}"/>
+		<env key="LD_LIBRARY_PATH" value="${env.LD_LIBRARY_PATH};${cppunit.lib}"/>
 		<env key="PATH" path="${env.PATH};${c.src.dir};"/>
                 <env key="CALLER" value="ANT"/>
                 <env key="CLOVER_HOME" value="${clover.home}"/>



Mime
View raw message