From 38a22b0cfd2356bdfc0d58835d5ccec24b394715 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Sat, 14 Apr 2018 18:54:48 +0200
Subject: [PATCH] it's enough to have one antunit dir inside of ./build

---
 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(-)

diff --git a/src/tests/antunit/core/location/location.xml b/src/tests/antunit/core/location/location.xml
index 091d6f337..bf37d9f16 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">
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 29068e488..c84ae49aa 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">
diff --git a/src/tests/antunit/taskdefs/taskdef-antlib-test.xml b/src/tests/antunit/taskdefs/taskdef-antlib-test.xml
index 58d01f064..b03911ee2 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">
diff --git a/src/tests/antunit/taskdefs/taskdef-test.xml b/src/tests/antunit/taskdefs/taskdef-test.xml
index 95745082a..0244270a0 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>