Permalink
Browse files

ZOOKEEPER-1384. test-cppunit overrides LD_LIBRARY_PATH and fails if g…

…cc is in non-standard location (Jay Shrauner via phunt)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1302281 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 097e3b9 commit 088e857f410c9e002d3308c4de5db6d9725ea83f @phunt phunt committed Mar 19, 2012
Showing with 5 additions and 2 deletions.
  1. +3 −0 CHANGES.txt
  2. +2 −2 build.xml
View
@@ -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:
View
@@ -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}"/>

0 comments on commit 088e857

Please sign in to comment.