Reviewers: Ray Ryan, Description: Description =========== The ant targets "compile.emma" and "-create.emma.coverage" only run if emma.enabled is defined, but they may cause confusion because it looks like they always run.
Fix === Changed the names to "compile.emma.if.enabled" and "-create.emma.coverage.if.enabled" to avoid confusion. Testing ======= I'm less confused. I'll run "ant test" and "ant test -Demma.enabled=true" before submitting. Please review this at http://gwt-code-reviews.appspot.com/75801 Affected files: build-tools/ant-gwt/build.xml common.ant.xml dev/core/build.xml tools/api-checker/build.xml user/build.xml Index: build-tools/ant-gwt/build.xml =================================================================== --- build-tools/ant-gwt/build.xml (revision 6278) +++ build-tools/ant-gwt/build.xml (working copy) @@ -15,7 +15,7 @@ </gwt.javac> </target> - <target name="compile.tests" depends="build, compile.emma" description="Compiles the test code for this project"> + <target name="compile.tests" depends="build, compile.emma.if.enabled" description="Compiles the test code for this project"> <mkdir dir="${javac.junit.out}" /> <gwt.javac srcdir="test" destdir="${javac.junit.out}"> <classpath> Index: tools/api-checker/build.xml =================================================================== --- tools/api-checker/build.xml (revision 6278) +++ tools/api-checker/build.xml (working copy) @@ -22,7 +22,7 @@ </gwt.javac> </target> - <target name="compile.tests" depends="compile.emma" description="Compiles the test code for this project"> + <target name="compile.tests" depends="compile.emma.if.enabled" description="Compiles the test code for this project"> <mkdir dir="${javac.junit.out}" /> <gwt.javac srcdir="test" destdir="${javac.junit.out}"> <classpath> Index: common.ant.xml =================================================================== --- common.ant.xml (revision 6278) +++ common.ant.xml (working copy) @@ -192,7 +192,7 @@ <echo message="Writing test results to @{test.reports} for @{test.cases}" /> <mkdir dir="@{test.reports}" /> - <antcall target="-create.emma.coverage"> + <antcall target="-create.emma.coverage.if.enabled"> <param name="test.emma.coverage" value="@{test.emma.coverage}"/> </antcall> <condition property="emma.lib" value="${emma.dir}/emma-2.0.5312-patched.jar" else=""> @@ -357,7 +357,7 @@ <taskdef resource="emma_ant.properties" classpathref="emma.taskdef.lib" /> - <target name="compile.emma" description="Instruments emma classes" unless="emma.compiled"> + <target name="compile.emma.if.enabled" description="Instruments emma classes" unless="emma.compiled"> <delete dir="${javac.emma.out}" /> <property name="emma.compiled" value="true" /> <antcall target="-compile.emma.if.enabled" /> @@ -376,7 +376,7 @@ </emma> </target> - <target name="-create.emma.coverage" description="Create the emma coverage directory" if="emma.enabled"> + <target name="-create.emma.coverage.if.enabled" description="Create the emma coverage directory" if="emma.enabled"> <delete dir="${test.emma.coverage}" /> <mkdir dir="${test.emma.coverage}" /> </target> Index: user/build.xml =================================================================== --- user/build.xml (revision 6278) +++ user/build.xml (working copy) @@ -66,7 +66,7 @@ <gwt.ant dir="../dev/core" target="compile.tests" /> </target> - <target name="compile.tests" depends="compile.dev.core.tests, compile.emma" description="Compiles the test code for this project"> + <target name="compile.tests" depends="compile.dev.core.tests, compile.emma.if.enabled" description="Compiles the test code for this project"> <mkdir dir="${javac.junit.out}" /> <gwt.javac srcdir="test" excludes="com/google/gwt/langtest/**" destdir="${javac.junit.out}"> <classpath> Index: dev/core/build.xml =================================================================== --- dev/core/build.xml (revision 6278) +++ dev/core/build.xml (working copy) @@ -7,7 +7,7 @@ <property name="gwt.junit.testcase.dev.core.includes" value="**/com/google/**/*Test.class" /> <property name="gwt.junit.testcase.dev.core.excludes" value="" /> - <target name="compile.tests" depends="build, compile.emma" description="Compiles the test code for this project"> + <target name="compile.tests" depends="build, compile.emma.if.enabled" description="Compiles the test code for this project"> <mkdir dir="${javac.junit.out}" /> <gwt.javac srcdir="test" destdir="${javac.junit.out}"> <classpath> --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
