Adds a name to all gwt.junit test targets so we can easily tell which one failed.
Patch by: jlabanca
Review by: fabbott
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@6646 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/build-tools/ant-gwt/build.xml b/build-tools/ant-gwt/build.xml
index 9c34b3a..ef5e530 100644
--- a/build-tools/ant-gwt/build.xml
+++ b/build-tools/ant-gwt/build.xml
@@ -37,7 +37,8 @@
<target name="test" depends="build, compile.tests" description="Run unit tests for this project.">
<fileset id="tests.antgwt" dir="${javac.junit.out}" includes="${gwt.junit.testcase.antgwt.includes}" excludes="${gwt.junit.testcase.antgwt.excludes}" />
- <gwt.junit test.out="${junit.out}" test.cases="tests.antgwt" />
+ <gwt.junit test.name="ant-gwt" test.out="${junit.out}"
+ test.cases="tests.antgwt" />
</target>
<target name="checkstyle" description="Static analysis of source">
diff --git a/common.ant.xml b/common.ant.xml
index a27083d..22f5677 100755
--- a/common.ant.xml
+++ b/common.ant.xml
@@ -161,6 +161,7 @@
<attribute name="test.reports" default="@{test.out}/reports" />
<attribute name="test.emma.coverage" default="@{test.out}/emma-coverage" />
<attribute name="test.cases" default="" />
+ <attribute name="test.name" default="" />
<attribute name="haltonfailure" default="true" />
<element name="extraclasspaths" optional="true" />
<sequential>
@@ -236,7 +237,7 @@
<isset property="junit.failure"/>
</and>
</condition>
- <fail message="One or more junit tests failed" if="junit.stop.build" />
+ <fail message="One or more junit tests failed for target: @{test.name}" if="junit.stop.build" />
</sequential>
</macrodef>
diff --git a/dev/build.xml b/dev/build.xml
index 9652c46..0991df8 100755
--- a/dev/build.xml
+++ b/dev/build.xml
@@ -253,7 +253,8 @@
<target name="test" depends="build, compile.tests" description="Run unit tests for this project.">
<fileset id="tests.dev.core" dir="${javac.junit.out}" includes="${gwt.junit.testcase.dev.core.includes}" excludes="${gwt.junit.testcase.dev.core.excludes}" />
- <gwt.junit test.out="${junit.out}" test.cases="tests.dev.core" >
+ <gwt.junit test.name="dev" test.out="${junit.out}"
+ test.cases="tests.dev.core" >
<extraclasspaths>
<pathelement location="${alldeps.jar}" />
<!-- TODO: the following six items are needed because dev (alone) does
diff --git a/tools/api-checker/build.xml b/tools/api-checker/build.xml
index 1799a30..a26c585 100755
--- a/tools/api-checker/build.xml
+++ b/tools/api-checker/build.xml
@@ -44,7 +44,8 @@
<target name="test" depends="build, compile.tests" description="Run unit tests for this project.">
<fileset id="tests.apichecker" dir="${javac.junit.out}" includes="${gwt.junit.testcase.apichecker.includes}" excludes="${gwt.junit.testcase.apichecker.excludes}" />
- <gwt.junit test.out="${junit.out}" test.cases="tests.apichecker" >
+ <gwt.junit test.name="api-checker" test.out="${junit.out}"
+ test.cases="tests.apichecker" >
<extraclasspaths>
<pathelement location="${gwt.build.out}/tools/api-checker/bin"/>
<pathelement location="${gwt.dev.jar}" />
diff --git a/user/build.xml b/user/build.xml
index c1e6571..3bc57cc 100755
--- a/user/build.xml
+++ b/user/build.xml
@@ -163,7 +163,7 @@
<fileset id="test.web.remote.tests" dir="${javac.junit.out}"
includes="${gwt.junit.testcase.web.includes}"
excludes="${gwt.junit.testcase.web.excludes}" />
- <gwt.junit
+ <gwt.junit test.name="test.web.remote"
test.args="${test.web.remote.args} -out www -web -runStyle RemoteWeb:${gwt.hosts.web.remote} -batch module"
test.out="${junit.out}/web-remote"
test.cases="test.web.remote.tests" >
@@ -183,7 +183,7 @@
<fileset id="test.dev.remote.tests" dir="${javac.junit.out}"
includes="${gwt.junit.testcase.dev.includes}"
excludes="${gwt.junit.testcase.dev.excludes}" />
- <gwt.junit
+ <gwt.junit test.name="test.dev.remote"
test.args="${test.dev.remote.args} -out www -runStyle RemoteWeb:${gwt.hosts.dev.remote} -batch module"
test.out="${junit.out}/dev-remote" test.cases="test.dev.remote.tests" >
<extraclasspaths>
@@ -202,7 +202,7 @@
<fileset id="test.emma.remote.tests" dir="${javac.junit.out}"
includes="${gwt.junit.testcase.dev.includes}"
excludes="${gwt.junit.testcase.dev.excludes}" />
- <gwt.junit
+ <gwt.junit test.name="test.emma.remote"
test.args="${test.emma.remote.args} -out www -runStyle RemoteWeb:${gwt.hosts.dev.remote} -batch module"
test.out="${junit.out}/emma-remote"
test.cases="test.emma.remote.tests" >
@@ -223,7 +223,7 @@
<fileset id="test.emma.selenium.tests" dir="${javac.junit.out}"
includes="${gwt.junit.testcase.dev.includes}"
excludes="${gwt.junit.testcase.dev.excludes}" />
- <gwt.junit
+ <gwt.junit test.name="test.emma.selenium"
test.args="${test.emma.selenium.args} -out www -runStyle Selenium:${gwt.hosts.dev.selenium} -batch module"
test.out="${junit.out}/emma-selenium"
test.cases="test.emma.selenium.tests" >
@@ -244,7 +244,7 @@
<fileset id="test.draft.remote.tests" dir="${javac.junit.out}"
includes="${gwt.junit.testcase.web.includes}"
excludes="${gwt.junit.testcase.web.excludes}" />
- <gwt.junit
+ <gwt.junit test.name="test.draft.remote"
test.args="${test.draft.remote.args} -draftCompile -web -out www -runStyle RemoteWeb:${gwt.hosts.web.remote} -batch module"
test.out="${junit.out}/draft-remote"
test.cases="test.draft.remote.tests" >
@@ -263,7 +263,7 @@
<fileset id="test.nometa.remote.tests" dir="${javac.junit.out}"
includes="${gwt.junit.testcase.web.includes}"
excludes="${gwt.junit.testcase.web.excludes}" />
- <gwt.junit
+ <gwt.junit test.name="test.nometa.remote"
test.args="${test.nometa.remote.args} -XdisableClassMetadata -web -out www -runStyle RemoteWeb:${gwt.hosts.web.remote} -batch module"
test.out="${junit.out}/nometa-remote"
test.cases="test.nometa.remote.tests" >
@@ -287,7 +287,7 @@
<fileset id="test.web.selenium.tests" dir="${javac.junit.out}"
includes="${gwt.junit.testcase.web.includes}"
excludes="${gwt.junit.testcase.web.excludes}" />
- <gwt.junit
+ <gwt.junit test.name="test.web.selenium"
test.args="${test.web.selenium.args} -web -out www -runStyle Selenium:${gwt.hosts.web.selenium} -batch module"
test.out="${junit.out}/web-selenium"
test.cases="test.web.selenium.tests" >
@@ -307,7 +307,7 @@
<fileset id="test.dev.selenium.tests" dir="${javac.junit.out}"
includes="${gwt.junit.testcase.dev.includes}"
excludes="${gwt.junit.testcase.dev.excludes}" />
- <gwt.junit
+ <gwt.junit test.name="test.dev.selenium"
test.args="${test.dev.selenium.args} -out www -runStyle Selenium:${gwt.hosts.dev.selenium} -batch module"
test.out="${junit.out}/dev-selenium"
test.cases="test.dev.selenium.tests" >
@@ -327,7 +327,7 @@
<fileset id="test.nometa.selenium.tests" dir="${javac.junit.out}"
includes="${gwt.junit.testcase.web.includes}"
excludes="${gwt.junit.testcase.web.excludes}" />
- <gwt.junit
+ <gwt.junit test.name="test.nometa.selenium"
test.args="${test.nometa.selenium.args} -XdisableClassMetadata -web -out www -runStyle Selenium:${gwt.hosts.web.selenium} -batch module"
test.out="${junit.out}/nometa-selenium"
test.cases="test.nometa.selenium.tests" >
@@ -347,7 +347,7 @@
<fileset id="test.draft.selenium.tests" dir="${javac.junit.out}"
includes="${gwt.junit.testcase.web.includes}"
excludes="${gwt.junit.testcase.web.excludes}" />
- <gwt.junit
+ <gwt.junit test.name="test.draft.selenium"
test.args="${test.draft.selenium.args} -draftCompile -web -out www -runStyle Selenium:${gwt.hosts.web.selenium} -batch module"
test.out="${junit.out}/draft-selenium"
test.cases="test.draft.selenium.tests" >
@@ -364,7 +364,7 @@
<fileset id="test.emma.htmlunit.tests" dir="${javac.junit.out}"
includes="${gwt.junit.testcase.dev.includes}"
excludes="${gwt.junit.testcase.dev.excludes}" />
- <gwt.junit test.args="${test.args}"
+ <gwt.junit test.name="test.emma.htmlunit" test.args="${test.args}"
test.out="${junit.out}/emma-htmlunit"
test.cases="test.emma.htmlunit.tests" >
<extraclasspaths>
@@ -381,7 +381,8 @@
<fileset id="test.dev.htmlunit.tests" dir="${javac.junit.out}"
includes="${gwt.junit.testcase.dev.includes}"
excludes="${gwt.junit.testcase.dev.excludes}" />
- <gwt.junit test.args="${test.args}" test.out="${junit.out}/dev-htmlunit"
+ <gwt.junit test.name="test.dev.htmlunit" test.args="${test.args}"
+ test.out="${junit.out}/dev-htmlunit"
test.cases="test.dev.htmlunit.tests" >
<extraclasspaths>
<path refid="test.extraclasspath" />
@@ -404,7 +405,8 @@
<fileset id="test.noserver.tests" dir="${javac.junit.out}"
includes="${gwt.junit.testcase.noserver.includes}"
excludes="${gwt.junit.testcase.noserver.excludes}" />
- <gwt.junit test.args="${test.args} -web -noserver"
+ <gwt.junit test.name="test.noserver"
+ test.args="${test.args} -web -noserver"
test.out="${junit.out}/noserver" test.cases="test.noserver.tests">
<extraclasspaths>
<path refid="test.extraclasspath" />
@@ -419,7 +421,8 @@
<fileset id="test.standards.tests" dir="${javac.junit.out}"
includes="${gwt.junit.testcase.standards.includes}"
excludes="${gwt.junit.testcase.standards.excludes}" />
- <gwt.junit test.args="${test.args} -web -standardsMode"
+ <gwt.junit test.name="test.standards"
+ test.args="${test.args} -web -standardsMode"
test.out="${junit.out}/standards" test.cases="test.standards.tests">
<extraclasspaths>
<path refid="test.extraclasspath" />
@@ -434,7 +437,8 @@
<fileset id="test.web.htmlunit.tests" dir="${javac.junit.out}"
includes="${gwt.junit.testcase.web.includes}"
excludes="${gwt.junit.testcase.web.excludes}" />
- <gwt.junit test.args="${test.args} -out www -web"
+ <gwt.junit test.name="test.web.htmlunit"
+ test.args="${test.args} -out www -web"
test.out="${junit.out}/web-htmlunit"
test.cases="test.web.htmlunit.tests">
<extraclasspaths>
@@ -450,7 +454,8 @@
<fileset id="test.nometa.htmlunit.tests" dir="${javac.junit.out}"
includes="${gwt.junit.testcase.web.includes}"
excludes="${gwt.junit.testcase.web.excludes}" />
- <gwt.junit test.args="${test.args} -XdisableClassMetadata -out www -web"
+ <gwt.junit test.name="test.nometa.htmlunit"
+ test.args="${test.args} -XdisableClassMetadata -out www -web"
test.out="${junit.out}/nometa-htmlunit"
test.cases="test.nometa.htmlunit.tests" >
<extraclasspaths>
@@ -466,7 +471,8 @@
<fileset id="test.draft.htmlunit.tests" dir="${javac.junit.out}"
includes="${gwt.junit.testcase.web.includes}"
excludes="${gwt.junit.testcase.web.excludes}" />
- <gwt.junit test.args="${test.args} -draftCompile -out www -web"
+ <gwt.junit test.name="test.draft.htmlunit"
+ test.args="${test.args} -draftCompile -out www -web"
test.out="${junit.out}/draft-htmlunit"
test.cases="test.draft.htmlunit.tests" >
<extraclasspaths>
