Committing missing file from r5798.
Patch by: jlabanca
Review by: fabbott (for r5798)
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@5799 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/build-tools/ant-gwt/build.xml b/build-tools/ant-gwt/build.xml
index 81b02d6..b08e085 100644
--- a/build-tools/ant-gwt/build.xml
+++ b/build-tools/ant-gwt/build.xml
@@ -3,6 +3,10 @@
<property name="project.tail" value="build-tools/ant-gwt" />
<import file="${gwt.root}/common.ant.xml" />
+ <fileset id="default.tests" dir="${javac.junit.out}">
+ <include name="**/*Test.class" />
+ </fileset>
+
<target name="compile" description="Compiles this project">
<mkdir dir="${javac.out}" />
<gwt.javac>
@@ -12,7 +16,7 @@
</gwt.javac>
</target>
- <target name="compile.tests" depends="build" description="Compiles the test code for this project">
+ <target name="compile.tests" depends="build, compile.emma" description="Compiles the test code for this project">
<mkdir dir="${javac.junit.out}" />
<gwt.javac srcdir="test" destdir="${javac.junit.out}">
<classpath>
@@ -33,32 +37,7 @@
</target>
<target name="test" depends="build, compile.tests" description="Run unit tests for this project.">
- <!-- TODO: refactor gwt.junit so it can be reused here -->
- <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
- <classpath>
- <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
- <pathelement location="${gwt.tools.antlib}/ant-junit-1.6.5.jar" />
- </classpath>
- </taskdef>
-
- <echo message="Writing test results to ${junit.out}/reports for ${test.cases}" />
- <mkdir dir="${junit.out}/reports" />
-
- <echo message="${javac.out} ${javac.junit.out}" />
- <junit dir="${junit.out}" fork="yes" printsummary="yes" haltonfailure="true">
- <classpath>
- <pathelement location="${javac.junit.out}" />
- <pathelement location="${javac.out}" />
- <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
- </classpath>
-
- <formatter type="plain" />
- <formatter type="xml" />
-
- <batchtest todir="${junit.out}/reports">
- <fileset dir="${javac.junit.out}" includes="**/*Test.class" />
- </batchtest>
- </junit>
+ <gwt.junit test.out="${junit.out}" test.cases="default.tests" />
</target>
<target name="checkstyle" description="Static analysis of source">
