merge Ant_1.6.2_compatible Ant_1.6.2_compatible
authorStefan Bodewig <bodewig@apache.org>
Sat, 26 Aug 2006 19:11:40 +0000 (19:11 +0000)
committerStefan Bodewig <bodewig@apache.org>
Sat, 26 Aug 2006 19:11:40 +0000 (19:11 +0000)
git-svn-id: https://svn.apache.org/repos/asf/ant/antlibs/dotnet/branches/Ant_1.6.2_compatible@437213 13f79535-47bb-0310-9956-ffa450edef68

build.xml
src/tests/junit/org/apache/ant/dotnet/DotNetExecTaskTest.java [moved from src/testcases/org/apache/ant/dotnet/DotNetExecTaskTest.java with 100% similarity]
src/tests/junit/org/apache/ant/dotnet/MSBuildTaskTest.java [moved from src/testcases/org/apache/ant/dotnet/MSBuildTaskTest.java with 100% similarity]
src/tests/junit/org/apache/ant/dotnet/NAntTaskTest.java [moved from src/testcases/org/apache/ant/dotnet/NAntTaskTest.java with 100% similarity]
src/tests/junit/org/apache/ant/dotnet/NUnitTaskTest.java [moved from src/testcases/org/apache/ant/dotnet/NUnitTaskTest.java with 100% similarity]

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