Migrated to new android build.xml script, refactored emma reporting into its own target that runs after coverage

pull/14/head
Tim Su 15 years ago
parent 8568b95569
commit 9ed65254e8

@ -1,66 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project name="astrid-test" default="help"> <project name="astrid-test" default="help">
<!-- The local.properties file is created and updated by the 'android' tool. <!-- The local.properties file is created and updated by the 'android'
It contains the path to the SDK. It should *NOT* be checked in in Version tool.
Control Systems. --> It contains the path to the SDK. It should *NOT* be checked into
Version Control Systems. -->
<property file="local.properties" /> <property file="local.properties" />
<!-- The build.properties file can be created by you and is never touched <!-- The build.properties file can be created by you and is never touched
by the 'android' tool. This is the place to change some of the default property values by the 'android' tool. This is the place to change some of the
used by the Ant rules. default property values used by the Ant rules.
Here are some properties you may want to change/update: Here are some properties you may want to change/update:
application.package
the name of your application package as defined in the manifest. Used by the
'uninstall' rule.
source.dir source.dir
the name of the source directory. Default is 'src'. The name of the source directory. Default is 'src'.
out.dir out.dir
the name of the output directory. Default is 'bin'. The name of the output directory. Default is 'bin'.
Properties related to the SDK location or the project target should be updated Properties related to the SDK location or the project target should
using the 'android' tool with the 'update' action. be updated using the 'android' tool with the 'update' action.
This file is an integral part of the build system for your application and This file is an integral part of the build system for your
should be checked in in Version Control Systems. application and should be checked into Version Control Systems.
--> -->
<property file="build.properties" /> <property file="build.properties" />
<!-- The default.properties file is created and updated by the 'android' tool, as well <!-- The default.properties file is created and updated by the 'android'
as ADT. tool, as well as ADT.
This file is an integral part of the build system for your application and This file is an integral part of the build system for your
should be checked in in Version Control Systems. --> application and should be checked into Version Control Systems. -->
<property file="default.properties" /> <property file="default.properties" />
<!-- Custom Android task to deal with the project target, and import the proper rules.
This requires ant 1.6.0 or above. -->
<path id="android.antlibs">
<pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
<pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
<pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
<pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
<pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
</path>
<taskdef name="setup" <!-- Required pre-setup import -->
classname="com.android.ant.SetupTask" <import file="${sdk.dir}/tools/ant/pre_setup.xml" />
classpathref="android.antlibs" />
<!-- Execute the Android Setup task that will setup some properties specific to the target, <!-- Execute the Android Setup task that will setup some properties
and import the build rules files. specific to the target, and import the build rules files.
The rules file is imported from The rules file is imported from
<SDK>/platforms/<target_platform>/templates/android_rules.xml <SDK>/tools/ant/
Depending on the project type it can be either:
To customize some build steps for your project: - main_rules.xml
- copy the content of the main node <project> from android_rules.xml - lib_rules.xml
- paste it in this build.xml below the <setup /> task. - test_rules.xml
- disable the import by changing the setup task below to <setup import="false" />
To customize existing targets, there are two options:
This will ensure that the properties are setup correctly but that your customized - Customize only one target:
build steps are used. - copy/paste the target into this file, *before* the
<setup> task.
- customize it to your needs.
- Customize the whole script.
- copy/paste the content of the rules files (minus the top node)
into this file, *after* the <setup> task
- disable the import of the rules by changing the setup task
below to <setup import="false" />.
- customize to your needs.
--> -->
<setup /> <setup />
@ -71,15 +67,13 @@
<echo> coverage: Run tests and dump emma coverage reports.</echo> <echo> coverage: Run tests and dump emma coverage reports.</echo>
</target> </target>
<target name="coverage" depends="-prepare-coverage-source"> <target name="coverage" depends="android_test_rules.coverage">
<antcall target="android-coverage"> <antcall target="pull-emma-reports" />
<param name="source.dir" value="bin/source" />
</antcall>
<antcall target="pull-junit" /> <antcall target="pull-junit" />
</target> </target>
<target name="-prepare-coverage-source"> <target name="-prepare-coverage-source">
<subant target="help"> <subant target="copy-sources">
<fileset file="${tested.project.absolute.dir}/build.xml" /> <fileset file="${tested.project.absolute.dir}/build.xml" />
</subant> </subant>
<copy todir="${tested.project.absolute.dir}/bin/source"> <copy todir="${tested.project.absolute.dir}/bin/source">
@ -102,20 +96,7 @@
</exec> </exec>
</target> </target>
<!-- clone of android coverage target with extra purposes: <target name="pull-emma-repots" depends="-prepare-coverage-source">
1. generate emma xml report
2. use adb device arg to pull coverage file
-->
<target name="android-coverage" depends="-set-coverage-classpath, -install-instrumented, install"
description="Runs the tests against the instrumented code and generates
code coverage report">
<run-tests-helper emma.enabled="true">
<extra-instrument-args>
<arg value="-e" />
<arg value="coverageFile" />
<arg value="${emma.dump.file}" />
</extra-instrument-args>
</run-tests-helper>
<echo>Downloading coverage file into project directory...</echo> <echo>Downloading coverage file into project directory...</echo>
<exec executable="${adb}" failonerror="true"> <exec executable="${adb}" failonerror="true">
<arg line="${adb.device.arg}"/> <arg line="${adb.device.arg}"/>
@ -128,13 +109,11 @@
<emma> <emma>
<report sourcepath="${tested.project.absolute.dir}/${source.dir}" <report sourcepath="${tested.project.absolute.dir}/${source.dir}"
verbosity="${verbosity}"> verbosity="${verbosity}">
<!-- TODO: report.dir or something like should be introduced if necessary -->
<infileset dir="."> <infileset dir=".">
<include name="coverage.ec" /> <include name="coverage.ec" />
<include name="coverage.em" /> <include name="coverage.em" />
</infileset> </infileset>
<!-- TODO: reports in other, indicated by user formats --> <html outfile="coverage.html" encoding="UTF-8" />
<html outfile="${reports.dir}/coverage.html" encoding="UTF-8" />
<xml outfile="${reports.dir}/coverage.xml" /> <xml outfile="${reports.dir}/coverage.xml" />
</report> </report>
</emma> </emma>
@ -142,27 +121,7 @@
<delete dir="${instrumentation.absolute.dir}" /> <delete dir="${instrumentation.absolute.dir}" />
<delete file="coverage.ec" /> <delete file="coverage.ec" />
<delete file="coverage.em" /> <delete file="coverage.em" />
<echo>Saving the report file in ${basedir}/coverage/coverage.html</echo> <echo>Saving the report file in ${basedir}/coverage/coverage.[html/xml]</echo>
</target> </target>
<macrodef name="run-tests-helper">
<attribute name="emma.enabled" default="false" />
<element name="extra-instrument-args" optional="yes" />
<sequential>
<echo>Running tests ...</echo>
<exec executable="${adb}" failonerror="true">
<arg line="${adb.device.arg}"/>
<arg value="shell" />
<arg value="am" />
<arg value="instrument" />
<arg value="-w" />
<arg value="-e" />
<arg value="coverage" />
<arg value="@{emma.enabled}" />
<extra-instrument-args />
<arg value="${manifest.package}/${test.runner}" />
</exec>
</sequential>
</macrodef>
</project> </project>

Loading…
Cancel
Save