Menu
▾
▴
[Ant-contrib-developers] CVS: cpptasks/samples cppunit.ant,1.3,1.4
|
From: Curt A. <ca...@us...> - 2004-04-26 03:01:42
|
Update of /cvsroot/ant-contrib/cpptasks/samples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27146/samples Modified Files: cppunit.ant Log Message: Append not replace LD_LIB_PATH (bug 937648) Index: cppunit.ant =================================================================== RCS file: /cvsroot/ant-contrib/cpptasks/samples/cppunit.ant,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** cppunit.ant 23 Apr 2004 21:15:45 -0000 1.3 --- cppunit.ant 26 Apr 2004 03:01:16 -0000 1.4 *************** *** 45,50 **** <echo message="test-all-but-qt will pass for gcc on Mac OS/X"/> <echo message="test-all-but-qt will pass for msvc on Windows"/> ! <echo message="test-all-but-qt will stall for bcc on Windows"/> ! <echo message="test-all-but-qt will fail for Cygwin gcc"/> </target> --- 45,52 ---- <echo message="test-all-but-qt will pass for gcc on Mac OS/X"/> <echo message="test-all-but-qt will pass for msvc on Windows"/> ! <echo message="all-but-qt will pass for bcc but test that divide by zero will fail"/> ! <echo message="test-all-but-qt will pass for gcc and CC on Solaris,"/> ! <echo message="but may be necessary to add /usr/ccs/bin so "ar" may be found and"/> ! <echo message="add the location of libstdc++ to LD_LIBRARY_PATH"/> </target> *************** *** 128,131 **** --- 130,136 ---- </or> </condition> + <property environment="env"/> + <!-- in case not set in environment, use an insignificant value --> + <property name="env.LD_LIBRARY_PATH" value="."/> </target> *************** *** 241,245 **** executable="${build.dir}/lib/cppunittestmain" failonerror="true"> ! <env key="LD_LIBRARY_PATH" value="${build.dir}/lib"/> </exec> </target> --- 246,250 ---- executable="${build.dir}/lib/cppunittestmain" failonerror="true"> ! <env key="LD_LIBRARY_PATH" value="${build.dir}/lib:${env.LD_LIBRARY_PATH}"/> </exec> </target> |