Author: j...@google.com Date: Fri Feb 6 13:29:31 2009 New Revision: 4662 Modified: trunk/dev/core/src/com/google/gwt/dev/shell/CompilingClassLoader.java trunk/user/build.xml
Log: Merging releases/1.6 into trunk. svn merge -r4657:4658 https://google-web-toolkit.googlecode.com/svn/releases/1.6 . Modified: trunk/dev/core/src/com/google/gwt/dev/shell/CompilingClassLoader.java ============================================================================== --- trunk/dev/core/src/com/google/gwt/dev/shell/CompilingClassLoader.java (original) +++ trunk/dev/core/src/com/google/gwt/dev/shell/CompilingClassLoader.java Fri Feb 6 13:29:31 2009 @@ -390,10 +390,10 @@ /** * Checks if the class names is generated. Accepts any classes whose names - * match .+$\d.* (handling named classes within anonymous classes and - * multiple named classes of the same name in a class, but in different - * methods). Checks if the class or any of its enclosing classes are anonymous - * or synthetic. + * match .+$\d.* (handling named classes within anonymous classes and multiple + * named classes of the same name in a class, but in different methods). + * Checks if the class or any of its enclosing classes are anonymous or + * synthetic. * <p> * If new compilers have different conventions for anonymous and synthetic * classes, this code needs to be updated. @@ -754,9 +754,9 @@ */ List<JsniMethod> jsniMethods = (unit == null) ? null : unit.getJsniMethods(); - if (unit != null && !unit.isSuperSource() && unit.hasAnonymousClasses() - && jsniMethods != null && jsniMethods.size() > 0 - && !unit.createdClassMapping()) { + if (unit != null && !unit.isSuperSource() && !unit.isGenerated() + && unit.hasAnonymousClasses() && jsniMethods != null + && jsniMethods.size() > 0 && !unit.createdClassMapping()) { if (!unit.constructAnonymousClassMappings(logger)) { logger.log(TreeLogger.ERROR, "Our heuristic for mapping anonymous classes between compilers " Modified: trunk/user/build.xml ============================================================================== --- trunk/user/build.xml (original) +++ trunk/user/build.xml Fri Feb 6 13:29:31 2009 @@ -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 --> <!-- --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---