Merging releases/1.6 into trunk.
svn merge -r4657:4658 https://google-web-toolkit.googlecode.com/svn/releases/1.6 .
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@4662 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/build.xml b/user/build.xml
index f18d8f7..3931c74 100755
--- a/user/build.xml
+++ b/user/build.xml
@@ -2,6 +2,7 @@
<property name="gwt.root" location=".." />
<property name="project.tail" value="user" />
<property name="test.args" value="" />
+ <property name="gwt.junit.emmatestcase.includes" value="**/*Suite.class,com/google/gwt/dev/jjs/test/*Test.class"/>
<import file="${gwt.root}/common.ant.xml" />
<!--
@@ -14,7 +15,7 @@
includes="**/EmmaClassLoadingTest.class" />
<fileset id="default.hosted.emma.tests" dir="${javac.junit.out}"
- excludes="**/CoverageTest.class" includes="**/*Test.class" />
+ excludes="**/CoverageTest.class,**/CompilerSuite.class" includes="${gwt.junit.emmatestcase.includes}" />
<!-- everything succeeds except CoverageTest.java. It fails due to a javac bug in sun/OpenJDK's Java. See the file contents for details -->
<!--
