You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2012/03/19 07:16:28 UTC
svn commit: r1302284 - in /zookeeper/branches/branch-3.4: CHANGES.txt
build.xml
Author: phunt
Date: Mon Mar 19 06:16:28 2012
New Revision: 1302284
URL: http://svn.apache.org/viewvc?rev=1302284&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/branches/branch-3.4/CHANGES.txt
zookeeper/branches/branch-3.4/build.xml
Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1302284&r1=1302283&r2=1302284&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Mon Mar 19 06:16:28 2012
@@ -31,6 +31,9 @@ BUGFIXES:
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:
ZOOKEEPER-1389. it would be nice if start-foreground used exec $JAVA
Modified: zookeeper/branches/branch-3.4/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/build.xml?rev=1302284&r1=1302283&r2=1302284&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/build.xml (original)
+++ zookeeper/branches/branch-3.4/build.xml Mon Mar 19 06:16:28 2012
@@ -391,7 +391,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}"/>
@@ -1257,7 +1257,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}"/>