From 089585b7c6a9e891a8971deadcf57338981fbabc Mon Sep 17 00:00:00 2001
From: Piotr Gurgul <pgurgul@google.com>
Date: Wed, 16 Sep 2009 13:29:07 -0700
Subject: [PATCH] Specify emma dump file location on the device explicitly

This is to avoid using default location for the emma dump file (coverage.ec)
which is generated on the device. Pointing out the custom location (which
for now is the same as the default one) is more straightforward and
will be important if the default location changes in the future.
---
 tools/scripts/android_test_rules.xml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/tools/scripts/android_test_rules.xml b/tools/scripts/android_test_rules.xml
index b7a407810..7bed3a5d5 100644
--- a/tools/scripts/android_test_rules.xml
+++ b/tools/scripts/android_test_rules.xml
@@ -16,17 +16,19 @@
 
     <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 value="shell" />
-                    <arg value="am" />
-                <arg value="instrument" />
-                   <arg value="-w" />
+                <arg value="am" />
+                   <arg value="instrument" />
+                <arg value="-w" />
                 <arg value="-e" />
                    <arg value="coverage" />
-                <arg value="@{emma.enabled}" />
-                   <arg value="${application.package.to.instrument}/${test.runner}" />
+                   <arg value="@{emma.enabled}" />
+                <extra-instrument-args />
+                <arg value="${application.package.to.instrument}/${test.runner}" />
             </exec>
         </sequential>
     </macrodef>
@@ -68,7 +70,13 @@
     <target name="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" />
+        <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>
         <exec executable="${adb}" failonerror="true">
             <arg value="pull" />