diff options
| author | Robert Greig <rgreig@apache.org> | 2007-09-11 13:02:19 +0000 |
|---|---|---|
| committer | Robert Greig <rgreig@apache.org> | 2007-09-11 13:02:19 +0000 |
| commit | bc4dc899dd98768f8bfe6c89f0aa5057cabe3ef4 (patch) | |
| tree | 51c4d6781edb72a2c9d8b195d53b948fa9fd3451 /java | |
| parent | b622a494bd6fae78c197814da937f7fc20072e4a (diff) | |
| download | qpid-python-bc4dc899dd98768f8bfe6c89f0aa5057cabe3ef4.tar.gz | |
QPID-591 Fixed to use dirname and avoid working directory issues.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@574585 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rw-r--r-- | java/broker/pom.xml | 6 | ||||
| -rwxr-xr-x | java/broker/python-test.xml | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/java/broker/pom.xml b/java/broker/pom.xml index b1dbded542..5f5aa9bb11 100644 --- a/java/broker/pom.xml +++ b/java/broker/pom.xml @@ -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> diff --git a/java/broker/python-test.xml b/java/broker/python-test.xml index a31dae0060..5212f2d384 100755 --- a/java/broker/python-test.xml +++ b/java/broker/python-test.xml @@ -28,7 +28,9 @@ under the License. <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"> |