Reviewers: amitmanjhi,
Description:
Two changes:
1. test failures were non-halting because we want the property named
junit.failure, not the property named by the contents of
${junit.failure},
2. moved the dev classpaths (core/*, oophm/*) into dev's
<extraclasspath> rather than global.
Please review this at http://gwt-code-reviews.appspot.com/72803
Affected files:
common.ant.xml
dev/build.xml
Index: common.ant.xml
===================================================================
--- common.ant.xml (revision 6233)
+++ common.ant.xml (working copy)
@@ -177,7 +177,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 +188,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 +224,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"
/>
Index: dev/build.xml
===================================================================
--- dev/build.xml (revision 6233)
+++ dev/build.xml (working copy)
@@ -232,6 +232,12 @@
<gwt.junit test.out="${junit.out}" test.cases="tests.dev.core" >
<extraclasspaths>
<pathelement location="${alldeps.jar}" />
+ <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/" />
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
