Ant: Some changes to speed-up manual testing
- Added 'precompile.disable' flag so as we can avoid precom-
piling modules that saves about 25 secs., hence running
certain tests is substantially faster, specially for
individual tests.
- Making 'test' depend on 'buildonly' instead of 'dist-dev'
saving about 5 secs because the creation of distribution
files is omitted: lib/gwt-dev.jar and staging/gwt-dev.jar
are the same.
- With this change and adding -Dprecompile.disable, presubmits
in Jenkins are 35 secs faster.
- Added a couple of missing flags to skip certain tests.
Change-Id: I120e96c788270eeabf1162b605d9497c08803117
diff --git a/build.xml b/build.xml
index fad7a60..083b9b8 100755
--- a/build.xml
+++ b/build.xml
@@ -155,7 +155,7 @@
<call-subproject subproject="tools" subtarget="compile.tests"/>
</target>
- <target name="test" depends="dist-dev,apicheck,checkstyle"
+ <target name="test" depends="buildonly,apicheck,checkstyle"
description="[action] Runs all the GWT tests, including checkstyle and apicheck">
<call-subproject subproject="buildtools" subtarget="test"/>
<call-subproject subproject="dev" subtarget="test"/>
@@ -166,8 +166,7 @@
<call-subproject subproject="tools" subtarget="test"/>
</target>
-
- <target name="testrf" depends="dist-dev"
+ <target name="testrf" depends="buildonly"
description="[action] Runs the GWT RequestFactory tests">
<call-subproject subproject="dev" subtarget="compile.tests"/>
<call-subproject subproject="user" subtarget="compile.tests"/>
diff --git a/common.ant.xml b/common.ant.xml
index bc2eb89..03570ba 100755
--- a/common.ant.xml
+++ b/common.ant.xml
@@ -109,8 +109,6 @@
</condition>
<!-- JUnit support -->
- <property name="gwt.dev.staging.jar"
- location="${gwt.build.staging}/gwt-${gwt.version}/gwt-dev.jar"/>
<property name="gwt.junit.port" value="8888"/>
<property name="gwt.junit.testcase.includes" value="**/*Suite.class"/>
diff --git a/dev/build.xml b/dev/build.xml
index 3787736..058a8fc 100755
--- a/dev/build.xml
+++ b/dev/build.xml
@@ -282,6 +282,7 @@
</target>
<target name="test" depends="build, compile.tests"
+ unless="test.dev.disable"
description="Run unit tests for this project.">
<fileset id="tests.dev.core" dir="${javac.junit.out}"
includes="${gwt.junit.testcase.dev.core.includes}"
diff --git a/tools/api-checker/build.xml b/tools/api-checker/build.xml
index 2b246d2..5f63f66 100755
--- a/tools/api-checker/build.xml
+++ b/tools/api-checker/build.xml
@@ -36,7 +36,6 @@
<classpath>
<pathelement location="${javac.out}" />
<pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar" />
- <pathelement location="${gwt.dev.staging.jar}" />
<pathelement location="${gwt.dev.jar}" />
<pathelement location="${gwt.build.out}/dev/bin-test" />
<pathelement location="${gwt.user.jar}" />
diff --git a/user/build.xml b/user/build.xml
index b959df9..6675a82 100755
--- a/user/build.xml
+++ b/user/build.xml
@@ -142,7 +142,8 @@
<!-- Precompile some GWT modules to speed up end-user builds -->
<!-- TODO(zundel): Find a way to precompile all modules -->
<!-- without tedious manual specification -->
- <target name="precompile.modules" depends="compile">
+ <target name="precompile.modules" depends="compile"
+ unless="precompile.disable">
<outofdate>
<sourcefiles>
<fileset dir="${gwt.root}/user/src">
@@ -442,7 +443,8 @@
<target name="test.coverage.htmlunit"
depends="compile, compile.tests"
- description="Run tests for coverage support">
+ description="Run tests for coverage support"
+ unless="test.coverage.htmlunit.disable">
<fileset id="test.coverage.htmlunit.tests" dir="${javac.junit.out}"
includes="com/google/gwt/dev/js/client/CoverageTest.class"
excludes=""/>
@@ -464,7 +466,7 @@
<property name="compile.complete" value="true"/>
<property name="compile.tests.complete" value="true"/>
- <property.ensure name="distro.built" location="${gwt.dev.staging.jar}"
+ <property.ensure name="dev.built" location="${gwt.dev.jar}"
message="GWT must be built before performing any tests. This can be fixed by running ant in the ${gwt.root} directory."/>
<limit failonerror="true" hours="${test.timeout}">
<parallel threadsPerProcessor="${gwt.threadsPerProcessor}"
@@ -492,7 +494,7 @@
<property name="compile.complete" value="true"/>
<property name="compile.tests.complete" value="true"/>
- <property.ensure name="distro.built" location="${gwt.dev.staging.jar}"
+ <property.ensure name="dev.built" location="${gwt.dev.jar}"
message="GWT must be built before performing any tests. This can be fixed by running ant in the ${gwt.root} directory."/>
<limit failonerror="true" hours="${test.timeout}">
<parallel threadsPerProcessor="${gwt.threadsPerProcessor}"
@@ -630,7 +632,7 @@
<property name="compile.complete" value="true"/>
<property name="compile.tests.complete" value="true"/>
- <property.ensure name="distro.built" location="${gwt.dev.staging.jar}"
+ <property.ensure name="dev.built" location="${gwt.dev.jar}"
message="GWT must be built before performing any tests. This can be fixed by running ant in the ${gwt.root} directory."/>
<limit failonerror="true" hours="${test.timeout}">
