Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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...
commit 088e857f410c9e002d3308c4de5db6d9725ea83f 1 parent 097e3b9
Patrick Hunt phunt authored

Showing 2 changed files with 5 additions and 2 deletions. Show diff stats Hide diff stats

  1. +3 0  CHANGES.txt
  2. +2 2 build.xml
3  CHANGES.txt
@@ -159,6 +159,9 @@ BUGFIXES:
159 159 check_priv_sep_dir (Chris Beauchamp via phunt)
160 160
161 161 ZOOKEEPER-1403. zkCli.sh script quoting issue (James Page via phunt)
  162 +
  163 + ZOOKEEPER-1384. test-cppunit overrides LD_LIBRARY_PATH and fails if
  164 + gcc is in non-standard location (Jay Shrauner via phunt)
162 165
163 166 IMPROVEMENTS:
164 167
4 build.xml
@@ -410,7 +410,7 @@
410 410 <property name="c.build" value="${build.dir}/c/build"/>
411 411 <exec dir="${build.dir}/c" executable="make" failonerror="true">
412 412 <arg value="install"/>
413   - <env key="LD_LIBRARY_PATH" value="${c.build}"/>
  413 + <env key="LD_LIBRARY_PATH" value="${env.LD_LIBRARY_PATH};${c.build}"/>
414 414 <env key="PATH" path="${env.PATH};${c.src.dir};"/>
415 415 <env key="CALLER" value="ANT"/>
416 416 <env key="base_dir" value="${basedir}"/>
@@ -1270,7 +1270,7 @@
1270 1270 if="cppunit"
1271 1271 description="to run cppunit test cases">
1272 1272 <exec dir="${test.cppunit.dir}" executable="make" failonerror="true">
1273   - <env key="LD_LIBRARY_PATH" value="${cppunit.lib}"/>
  1273 + <env key="LD_LIBRARY_PATH" value="${env.LD_LIBRARY_PATH};${cppunit.lib}"/>
1274 1274 <env key="PATH" path="${env.PATH};${c.src.dir};"/>
1275 1275 <env key="CALLER" value="ANT"/>
1276 1276 <env key="CLOVER_HOME" value="${clover.home}"/>

0 comments on commit 088e857

Please sign in to comment.
Something went wrong with that request. Please try again.