Author: rgreig
Date: Tue Sep 11 06:02:19 2007
New Revision: 574585
URL: http://svn.apache.org/viewvc?rev=574585&view=rev
Log:
QPID-591 Fixed to use dirname and avoid working directory issues.
Modified:
incubator/qpid/branches/M2.1/java/broker/pom.xml
incubator/qpid/branches/M2.1/java/broker/python-test.xml
Modified: incubator/qpid/branches/M2.1/java/broker/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/pom.xml?rev=574585&r1=574584&r2=574585&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/pom.xml (original)
+++ incubator/qpid/branches/M2.1/java/broker/pom.xml Tue Sep 11 06:02:19 2007
@@ -204,12 +204,6 @@
<configuration>
<tasks>
- <condition property="broker.dir"
-
else="${user.dir}${file.separator}broker"
- value="${user.dir}">
- <contains string="${user.dir}"
substring="broker" />
- </condition>
-
<condition property="skip-python-tests"
value="true">
<isset property="skip.python.tests"/>
</condition>
Modified: incubator/qpid/branches/M2.1/java/broker/python-test.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/python-test.xml?rev=574585&r1=574584&r2=574585&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/python-test.xml (original)
+++ incubator/qpid/branches/M2.1/java/broker/python-test.xml Tue Sep 11
06:02:19 2007
@@ -28,7 +28,9 @@
<echo message="Used via maven to run python tests."/>
</target>
- <property name="pythondir" value="../../python"/>
+ <dirname property="broker.dir" file="${ant.file.python-test}"/>
+
+ <property name="pythondir" value="${broker.dir}/../../python"/>
<target name="run-tests" unless="skip-python-tests">
