LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 13130ae0: Merge change 25340 into eclair

Browse Source 
Merge commit '13130ae08d8bf2a7aeb14c4e0cd64fb58ed78ab3' into eclair-plus-aosp

* commit '13130ae08d8bf2a7aeb14c4e0cd64fb58ed78ab3':
  Specify emma dump file location on the device explicitly
This commit is contained in:
Piotr Gurgul
2009-09-17 12:31:02 -07:00
committed by Android Git Automerger
parent d79bf05747 13130ae08d
commit 672637fc74
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/scripts/android_test_rules.xml
View File

@@ -16,17 +16,19 @@
<macrodef name="run-tests-helper"> <macrodef name="run-tests-helper">
<attribute name="emma.enabled" default="false" /> <attribute name="emma.enabled" default="false" />
<element name="extra-instrument-args" optional="yes" />
<sequential> <sequential>
<echo>Running tests ...</echo> <echo>Running tests ...</echo>
<exec executable="${adb}" failonerror="true"> <exec executable="${adb}" failonerror="true">
<arg value="shell" /> <arg value="shell" />
<arg value="am" /> <arg value="am" />
<arg value="instrument" /> <arg value="instrument" />
<arg value="-w" /> <arg value="-w" />
<arg value="-e" /> <arg value="-e" />
<arg value="coverage" /> <arg value="coverage" />
<arg value="@{emma.enabled}" /> <arg value="@{emma.enabled}" />
<arg value="${application.package.to.instrument}/${test.runner}" /> <extra-instrument-args />
<arg value="${application.package.to.instrument}/${test.runner}" />
</exec> </exec>
</sequential> </sequential>
</macrodef> </macrodef>
@@ -68,7 +70,13 @@
<target name="coverage" depends="-set-coverage-classpath, -install-instrumented, install" <target name="coverage" depends="-set-coverage-classpath, -install-instrumented, install"
description="Runs the tests against the instrumented code and generates description="Runs the tests against the instrumented code and generates
code coverage report"> code coverage report">
<run-tests-helper emma.enabled="true" /> <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 value="pull" /> <arg value="pull" />