it's enough to have one antunit dir inside of ./build

Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/38a22b0c
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/38a22b0c
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/38a22b0c

Branch: refs/heads/master
Commit: 38a22b0cfd2356bdfc0d58835d5ccec24b394715
Parents: b38bf68
Author: Stefan Bodewig <bode...@apache.org>
Authored: Sat Apr 14 18:54:48 2018 +0200
Committer: Stefan Bodewig <bode...@apache.org>
Committed: Sat Apr 14 18:54:48 2018 +0200

----------------------------------------------------------------------
 src/tests/antunit/core/location/location.xml                       | 2 +-
 .../taskdefs/optional/junit/junit-outputtoformatters-test.xml      | 2 +-
 src/tests/antunit/taskdefs/taskdef-antlib-test.xml                 | 2 +-
 src/tests/antunit/taskdefs/taskdef-test.xml                        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/38a22b0c/src/tests/antunit/core/location/location.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/core/location/location.xml 
b/src/tests/antunit/core/location/location.xml
index 091d6f3..bf37d9f 100644
--- a/src/tests/antunit/core/location/location.xml
+++ b/src/tests/antunit/core/location/location.xml
@@ -20,7 +20,7 @@
        
   <property name="ant.build.dir" location="../../../../../build"/>
   <property name="working.dir"
-            location="${ant.build.dir}/ant-unit/location-dir"/>
+            location="${ant.build.dir}/antunit/location-dir"/>
   <property name="classes.dir" location="${working.dir}/classes"/>
   
   <target name="all">

http://git-wip-us.apache.org/repos/asf/ant/blob/38a22b0c/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml
----------------------------------------------------------------------
diff --git 
a/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml 
b/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml
index 29068e4..c84ae49 100644
--- 
a/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml
+++ 
b/src/tests/antunit/taskdefs/optional/junit/junit-outputtoformatters-test.xml
@@ -18,7 +18,7 @@
 <project default="all" xmlns:au="antlib:org.apache.ant.antunit">
   <import file="../../../antunit-base.xml" />
   <property name="ant-build" location="../../../../../../build"/>
-  <property name="build-junit-dir" location="${ant-build}/ant-unit/junit-dir"/>
+  <property name="build-junit-dir" location="${ant-build}/antunit/junit-dir"/>
   <property name="reports.dir" location="${build-junit-dir}/report"/>
 
   <macrodef name="assert-file-not-contains" backtrace="no">

http://git-wip-us.apache.org/repos/asf/ant/blob/38a22b0c/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/taskdef-antlib-test.xml 
b/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
index 58d01f0..b03911e 100644
--- a/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
+++ b/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
@@ -22,7 +22,7 @@
 
     <target name="setUp" if="jdk1.6+">
         <mkdir dir="${input}/org/example" />
-        <property name="tmpdir" location="../../../../build/ant-unit/taskdef" 
/>
+        <property name="tmpdir" location="../../../../build/antunit/taskdef" />
         <mkdir dir="${tmpdir}" />
         <echo file="${input}/org/example/antlib.xml">
             <![CDATA[<antlib xmlns:e="ant:current">

http://git-wip-us.apache.org/repos/asf/ant/blob/38a22b0c/src/tests/antunit/taskdefs/taskdef-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/taskdef-test.xml 
b/src/tests/antunit/taskdefs/taskdef-test.xml
index 9574508..0244270 100644
--- a/src/tests/antunit/taskdefs/taskdef-test.xml
+++ b/src/tests/antunit/taskdefs/taskdef-test.xml
@@ -20,7 +20,7 @@
 
   <target name="setUp">
     <mkdir dir="${input}/org/example"/>
-    <property name="tmpdir" location="../../../../build/ant-unit/taskdef"/>
+    <property name="tmpdir" location="../../../../build/antunit/taskdef"/>
     <mkdir dir="${tmpdir}"/>
     <echoxml file="${input}/org/example/antlib.xml">
       <antlib>

Reply via email to