summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2007-05-18 14:12:28 +0000
committerMartin Ritchie <ritchiem@apache.org>2007-05-18 14:12:28 +0000
commit3f80e3cce68370a342e32dabd6b7d6ce0e87d758 (patch)
treec2fa2ab9879c56ef8472dba1f7e040914e5a1cd0
parenta980d618a85e3cd6931c2c0cd09946f542e342e0 (diff)
downloadqpid-python-3f80e3cce68370a342e32dabd6b7d6ce0e87d758.tar.gz
QPID-401 Update to pom to correctly set the broker.dir
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@539476 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--java/broker/pom.xml9
1 files changed, 5 insertions, 4 deletions
diff --git a/java/broker/pom.xml b/java/broker/pom.xml
index dbdb9daba6..2bd243e0b3 100644
--- a/java/broker/pom.xml
+++ b/java/broker/pom.xml
@@ -168,13 +168,14 @@
<tasks>
<condition property="broker.dir"
- value="${user.dir}${file.separator}..${file.separator}broker"
- else="${user.dir}">
- <equals arg1="${topDirectoryLocation}" arg2="." />
+ else="${user.dir}${file.separator}broker"
+ value="${user.dir}">
+ <contains string="${user.dir}" substring="broker" />
</condition>
<property name="command"
- value="bash -c 'python run-tests -v -I java_failing.txt'"/>
+ value="python run-tests -v -I java_failing.txt"/>
+ <!--value="bash -c 'python run-tests -v -I java_failing.txt'"/>-->
<ant antfile="python-test.xml" inheritRefs="true">
<target name="run-tests" />