Revision: 7130 Author: r...@google.com Date: Mon Nov 23 13:19:22 2009 Log: Merged tr...@7122 into this branch Replace JUnit's -web command-line flag with -prod (keeping -web as a deprecated synonym) svn merge --ignore-ancestry -c 7122 http://google-web-toolkit.googlecode.com/svn/trunk .
http://code.google.com/p/google-web-toolkit/source/detail?r=7130 Modified: /releases/2.0/branch-info.txt /releases/2.0/user/build.xml /releases/2.0/user/src/com/google/gwt/junit/JUnitShell.java /releases/2.0/user/src/com/google/gwt/user/tools/JUnit-prod.launchsrc /releases/2.0/user/src/com/google/gwt/user/tools/project.ant.xmlsrc ======================================= --- /releases/2.0/branch-info.txt Mon Nov 23 12:44:09 2009 +++ /releases/2.0/branch-info.txt Mon Nov 23 13:19:22 2009 @@ -988,3 +988,7 @@ https://google-web-toolkit.googlecode.com/svn/trunk/ . svn merge --ignore-ancestry -c7125 \ https://google-web-toolkit.googlecode.com/svn/trunk/ . + +tr...@7122 was merged into this branch + Replace JUnit's -web command-line flag with -prod (keeping -web as a deprecated synonym) + svn merge --ignore-ancestry -c 7122 http://google-web-toolkit.googlecode.com/svn/trunk . ======================================= --- /releases/2.0/user/build.xml Mon Nov 23 10:40:40 2009 +++ /releases/2.0/user/build.xml Mon Nov 23 13:19:22 2009 @@ -158,7 +158,7 @@ includes="${gwt.junit.testcase.web.includes}" excludes="${gwt.junit.testcase.web.excludes}" /> <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.args="${test.web.remote.args} -out www -prod -runStyle RemoteWeb:${gwt.hosts.web.remote} -batch module" test.out="${junit.out}/web-remote" test.cases="test.web.remote.tests" > <extraclasspaths> @@ -239,7 +239,7 @@ includes="${gwt.junit.testcase.web.includes}" excludes="${gwt.junit.testcase.web.excludes}" /> <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.args="${test.draft.remote.args} -draftCompile -prod -out www -runStyle RemoteWeb:${gwt.hosts.web.remote} -batch module" test.out="${junit.out}/draft-remote" test.cases="test.draft.remote.tests" > <extraclasspaths> @@ -258,7 +258,7 @@ includes="${gwt.junit.testcase.web.includes}" excludes="${gwt.junit.testcase.web.excludes}" /> <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.args="${test.nometa.remote.args} -XdisableClassMetadata -prod -out www -runStyle RemoteWeb:${gwt.hosts.web.remote} -batch module" test.out="${junit.out}/nometa-remote" test.cases="test.nometa.remote.tests" > <extraclasspaths> @@ -282,7 +282,7 @@ includes="${gwt.junit.testcase.web.includes}" excludes="${gwt.junit.testcase.web.excludes}" /> <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.args='${test.web.selenium.args} -prod -out www -runStyle "Selenium:${gwt.hosts.web.selenium}" -batch module' test.out="${junit.out}/web-selenium" test.cases="test.web.selenium.tests" > <extraclasspaths> @@ -322,7 +322,7 @@ includes="${gwt.junit.testcase.web.includes}" excludes="${gwt.junit.testcase.web.excludes}" /> <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.args='${test.nometa.selenium.args} -XdisableClassMetadata -prod -out www -runStyle "Selenium:${gwt.hosts.web.selenium}" -batch module' test.out="${junit.out}/nometa-selenium" test.cases="test.nometa.selenium.tests" > <extraclasspaths> @@ -342,7 +342,7 @@ includes="${gwt.junit.testcase.web.includes}" excludes="${gwt.junit.testcase.web.excludes}" /> <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.args='${test.draft.selenium.args} -draftCompile -prod -out www -runStyle "Selenium:${gwt.hosts.web.selenium}" -batch module' test.out="${junit.out}/draft-selenium" test.cases="test.draft.selenium.tests" > <extraclasspaths> @@ -400,7 +400,7 @@ includes="${gwt.junit.testcase.noserver.includes}" excludes="${gwt.junit.testcase.noserver.excludes}" /> <gwt.junit test.name="test.noserver" - test.args="${test.args} -web -noserver" + test.args="${test.args} -prod -noserver" test.out="${junit.out}/noserver" test.cases="test.noserver.tests"> <extraclasspaths> <path refid="test.extraclasspath" /> @@ -416,7 +416,7 @@ includes="${gwt.junit.testcase.standards.includes}" excludes="${gwt.junit.testcase.standards.excludes}" /> <gwt.junit test.name="test.standards" - test.args="${test.args} -web -XstandardsMode" + test.args="${test.args} -prod -XstandardsMode" test.out="${junit.out}/standards" test.cases="test.standards.tests"> <extraclasspaths> <path refid="test.extraclasspath" /> @@ -432,7 +432,7 @@ includes="${gwt.junit.testcase.web.includes}" excludes="${gwt.junit.testcase.web.excludes}" /> <gwt.junit test.name="test.web.htmlunit" - test.args="${test.args} -out www -web" + test.args="${test.args} -out www -prod" test.out="${junit.out}/web-htmlunit" test.cases="test.web.htmlunit.tests"> <extraclasspaths> @@ -449,7 +449,7 @@ includes="${gwt.junit.testcase.web.includes}" excludes="${gwt.junit.testcase.web.excludes}" /> <gwt.junit test.name="test.nometa.htmlunit" - test.args="${test.args} -XdisableClassMetadata -out www -web" + test.args="${test.args} -XdisableClassMetadata -out www -prod" test.out="${junit.out}/nometa-htmlunit" test.cases="test.nometa.htmlunit.tests" > <extraclasspaths> @@ -466,7 +466,7 @@ includes="${gwt.junit.testcase.web.includes}" excludes="${gwt.junit.testcase.web.excludes}" /> <gwt.junit test.name="test.draft.htmlunit" - test.args="${test.args} -draftCompile -out www -web" + test.args="${test.args} -draftCompile -out www -prod" test.out="${junit.out}/draft-htmlunit" test.cases="test.draft.htmlunit.tests" > <extraclasspaths> ======================================= --- /releases/2.0/user/src/com/google/gwt/junit/JUnitShell.java Fri Nov 20 12:14:17 2009 +++ /releases/2.0/user/src/com/google/gwt/junit/JUnitShell.java Mon Nov 23 13:19:22 2009 @@ -166,13 +166,18 @@ registerHandler(new ArgHandlerFlag() { @Override public String getPurpose() { - return "Causes your test to run in web (compiled) mode (defaults to development mode)"; + return "Synonym for -prod (deprecated)"; } @Override public String getTag() { return "-web"; } + + @Override + public boolean isUndocumented() { + return true; + } @Override public boolean setFlag() { @@ -180,6 +185,24 @@ return true; } }); + + registerHandler(new ArgHandlerFlag() { + @Override + public String getPurpose() { + return "Causes your test to run in production (compiled) mode (defaults to development mode)"; + } + + @Override + public String getTag() { + return "-prod"; + } + + @Override + public boolean setFlag() { + developmentMode = false; + return true; + } + }); registerHandler(new ArgHandlerInt() { @Override @@ -689,7 +712,8 @@ private String[] remoteUserAgents; /** - * What type of test we're running; Local development, local web, or remote web. + * What type of test we're running; Local development, local production, + * or remote production. */ private RunStyle runStyle = null; ======================================= --- /releases/2.0/user/src/com/google/gwt/user/tools/JUnit-prod.launchsrc Wed Nov 18 18:11:58 2009 +++ /releases/2.0/user/src/com/google/gwt/user/tools/JUnit-prod.launchsrc Mon Nov 23 13:19:22 2009 @@ -12,6 +12,6 @@ <listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry externalArchive="@gwtDevPath" path="3" type="2"/> "/> </listAttribute> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@moduleShortName"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dgwt.args="-web -logLevel WARN -out www-test" -Xmx256M"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dgwt.args="-prod -logLevel WARN -out www-test" -Xmx256M"/> <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> </launchConfiguration> ======================================= --- /releases/2.0/user/src/com/google/gwt/user/tools/project.ant.xmlsrc Wed Nov 18 18:11:58 2009 +++ /releases/2.0/user/src/com/google/gwt/user/tools/project.ant.xmlsrc Mon Nov 23 13:19:22 2009 @@ -91,7 +91,7 @@ <mkdir dir="reports/htmlunit.prod" /> <junit fork="yes" printsummary="yes" haltonfailure="yes"> <jvmarg line="-Xmx256m" /> - <sysproperty key="gwt.args" value="-web -logLevel WARN -out www-test" /> + <sysproperty key="gwt.args" value="-prod -logLevel WARN -out www-test" /> <sysproperty key="java.awt.headless" value="true" /> <classpath> <pathelement location="test" /> -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
