Ant fixes to make test failure correctly blocking, and to cover the core/*,oophm/* pattern in dev more properly. TODO to remove that part once core & oophm merge, and there's (normatively) just src, super, test.
Review by: amitmanjhi
git-svn-id: https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt@6234 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/common.ant.xml b/common.ant.xml
index 8ba9e81..5750b0a 100755
--- a/common.ant.xml
+++ b/common.ant.xml
@@ -150,7 +150,10 @@
</macrodef>
<macrodef name="gwt.junit">
- <!-- TODO: make this more generic / refactor so it can be used from dev/core -->
+ <!-- TODO: Because dev has core, oophm splits, the "common pattern" here doesn't work
+ for it (and we use extraclasspaths entries instead). Once we lose SWT, we can
+ consolidate dev/core and dev/oophm, and that can instead more to the normal
+ pattern. -->
<attribute name="test.args" default="" />
<attribute name="test.out" default="" />
<attribute name="test.reports" default="@{test.out}/reports" />
@@ -177,7 +180,6 @@
<isset property="emma.enabled" />
</condition>
- <echo message="${javac.out} ${javac.junit.out}" />
<junit dir="@{test.out}" fork="yes" printsummary="yes"
failureproperty="junit.failure" tempdir="@{test.out}">
<jvmarg line="-Xmx768m" />
@@ -189,12 +191,6 @@
<path refid="project.classpath.src" />
<pathelement location="${gwt.root}/${project.tail}/super" />
<pathelement location="${gwt.root}/${project.tail}/test" />
- <pathelement location="${gwt.root}/${project.tail}/core/src" />
- <pathelement location="${gwt.root}/${project.tail}/core/super" />
- <pathelement location="${gwt.root}/${project.tail}/core/test" />
- <pathelement location="${gwt.root}/${project.tail}/oophm/src" />
- <pathelement location="${gwt.root}/${project.tail}/oophm/overlay" />
- <pathelement location="${gwt.root}/${project.tail}/oophm/test" />
<pathelement location="${javac.junit.out}" />
<!-- javac.emma.out is empty unless emma is enabled. -->
<pathelement location="${javac.emma.out}" />
@@ -231,7 +227,7 @@
<condition property="junit.stop.build" value="true">
<and>
<istrue value="@{haltonfailure}"/>
- <isset property="${junit.failure}"/>
+ <isset property="junit.failure"/>
</and>
</condition>
<fail message="One or more junit tests failed" if="junit.stop.build" />
diff --git a/dev/build.xml b/dev/build.xml
index d097b2a..40e7495 100755
--- a/dev/build.xml
+++ b/dev/build.xml
@@ -232,6 +232,16 @@
<gwt.junit 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
+ not adhere to the .../{src,super,test} convention, having a split
+ between core, oophm, and (historically) the OS platforms. When
+ that unifies, these should go away. -->
+ <pathelement location="${gwt.root}/${project.tail}/core/src" />
+ <pathelement location="${gwt.root}/${project.tail}/core/super" />
+ <pathelement location="${gwt.root}/${project.tail}/core/test" />
+ <pathelement location="${gwt.root}/${project.tail}/oophm/src" />
+ <pathelement location="${gwt.root}/${project.tail}/oophm/overlay" />
+ <pathelement location="${gwt.root}/${project.tail}/oophm/test" />
<!-- Pull in gwt-dev and gwt-user sources for .gwt.xml files -->
<pathelement location="${gwt.root}/user/src/" />
<pathelement location="${gwt.root}/user/super/" />
