Fixed coverage dir for instrumentation tests.

build/android/pylib/local/device/local_device_instrumentation_test_run.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
+import os
 import re
 import time
 
 from devil.android import device_errors
 from devil.android import flag_changer
 from devil.utils import reraiser_thread
 from pylib import valgrind_tools
 from pylib.base import base_test_result
 from pylib.local.device import local_device_test_run
 
@@ skipping 163 matching lines @@
     if flags.remove:
       display_name = '%s without {%s}' % (display_name, ' '.join(flags.remove))
     return display_name
 
   #override
   def _RunTest(self, device, test):
     extras = {}
 
     flags = None
     test_timeout_scale = None
+    if self._test_instance.coverage_directory:
+      coverage_basename = '%s.ec' % ('%s_group' % test[0]['method']
+          if isinstance(test, list) else test['method'])
+      extras['coverage'] = 'true'
+      coverage_directory = os.path.join(
+          device.GetExternalStoragePath(), 'chrome', 'test', 'coverage')
+      coverage_device_file = os.path.join(
+          coverage_directory, coverage_basename)
+      extras['coverageFile'] = coverage_device_file
+
     if isinstance(test, list):
       if not self._test_instance.driver_apk:
         raise Exception('driver_apk does not exist. '
                         'Please build it and try again.')
 
       def name_and_timeout(t):
         n = self._GetTestName(t)
         i = self._GetTimeoutFromAnnotations(t['annotations'], n)
         return (n, i)
 
@@ skipping 73 matching lines @@
             self._test_instance.apk_under_test.GetPermissions()
             if self._test_instance.apk_under_test
             else None)
         device.ClearApplicationState(self._test_instance.package_info.package,
                                      permissions=permissions)
 
     else:
       logging.debug('raw output from %s:', test_display_name)
       for l in output:
         logging.debug('  %s', l)
-
+    if self._test_instance.coverage_directory:
+      device.PullFile(coverage_directory,
+          self._test_instance.coverage_directory)
+      device.RunShellCommand('rm -f %s' % os.path.join(coverage_directory,
+          '*'))
     return results
 
   #override
   def _ShouldShard(self):
     return True
 
   @classmethod
   def _GetTimeoutScaleFromAnnotations(cls, annotations):
     try:
       return int(annotations.get('TimeoutScale', 1))
     except ValueError as e:
       logging.warning("Non-integer value of TimeoutScale ignored. (%s)", str(e))
       return 1
 
   @classmethod
   def _GetTimeoutFromAnnotations(cls, annotations, test_name):
     for k, v in TIMEOUT_ANNOTATIONS:
       if k in annotations:
         timeout = v
         break
     else:
       logging.warning('Using default 1 minute timeout for %s', test_name)
       timeout = 60
 
     timeout *= cls._GetTimeoutScaleFromAnnotations(annotations)
 
     return timeout