merge

git-svn-id: https://svn.apache.org/repos/asf/ant/antlibs/dotnet/branches/Ant_1.6.2_compatible@437213 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index 24e9f8a147a1b58ae05a48fc595403c7cac89919..ac026773ffd572241cf3929b21bb40e6fe0975c5 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -38,11 +38,11 @@
     <fail unless="good-ant-version?">This branch must be built using Ant 1.6.x with x &gt;= 2</fail>
   </target>
 
-  <target name="test" depends="compile-tests">
+  <target name="junit-test" depends="compile-tests">
     <junit
       printsummary="false"
       haltonfailure="false"
-      failureproperty="tests.failed"
+      failureproperty="junit.tests.failed"
       filtertrace="false"
       fork="true"
       forkmode="once"
@@ -55,12 +55,11 @@
       </classpath>
 
       <batchtest>
-        <fileset dir="src/testcases"/>
+        <fileset dir="${src.junit}"/>
       </batchtest>
 
       <formatter type="plain" usefile="false"/>
     </junit>
 
-    <fail if="tests.failed">At least one test has failed.</fail>
   </target>
-</project>
\ No newline at end of file
+</project>

diff --git a/src/testcases/org/apache/ant/dotnet/DotNetExecTaskTest.java b/src/tests/junit/org/apache/ant/dotnet/DotNetExecTaskTest.java
similarity index 100%
rename from src/testcases/org/apache/ant/dotnet/DotNetExecTaskTest.java
rename to src/tests/junit/org/apache/ant/dotnet/DotNetExecTaskTest.java

diff --git a/src/testcases/org/apache/ant/dotnet/MSBuildTaskTest.java b/src/tests/junit/org/apache/ant/dotnet/MSBuildTaskTest.java
similarity index 100%
rename from src/testcases/org/apache/ant/dotnet/MSBuildTaskTest.java
rename to src/tests/junit/org/apache/ant/dotnet/MSBuildTaskTest.java

diff --git a/src/testcases/org/apache/ant/dotnet/NAntTaskTest.java b/src/tests/junit/org/apache/ant/dotnet/NAntTaskTest.java
similarity index 100%
rename from src/testcases/org/apache/ant/dotnet/NAntTaskTest.java
rename to src/tests/junit/org/apache/ant/dotnet/NAntTaskTest.java

diff --git a/src/testcases/org/apache/ant/dotnet/NUnitTaskTest.java b/src/tests/junit/org/apache/ant/dotnet/NUnitTaskTest.java
similarity index 100%
rename from src/testcases/org/apache/ant/dotnet/NUnitTaskTest.java
rename to src/tests/junit/org/apache/ant/dotnet/NUnitTaskTest.java