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.CoverageDirectory():
+      coverage_basename = '%s.ec' % test['method']

[mikecase (-- gone --), 2016/05/11 17:39:58]

This will crash if test is a list, which I think it sometimes can be.

[BigBossZhiling, 2016/05/20 18:38:08]

Done.

+      extras['coverage'] = 'true'
+      coverage_device_file = '%s/%s/%s' % (
+                    device.GetExternalStoragePath(), 'chrome/test/coverage',
+                    coverage_basename)

[mikecase (-- gone --), 2016/05/11 17:39:58]

This indentation is a bit off. Probably do something like...

coverage_device_file = (
    '%s/%s/%s' % (
        device.GetExternalStoragePath(),
        'chrome/test/coverage',
        coverage_basename))

OR

coverage_device_file = '%s/%s/%s' % (device.GetExternalStoragePath(),
                                     'chrome/test/coverage',
                                     coverage_basename)

Wow, pretty much all indentation for this looks super awkward. Oh well....

[jbudorick, 2016/05/17 00:07:33]

This should instead be:

  coverage_device_file = posixpath.join(
      device.GetExternalStoragePath(), 'chrome', 'test', 'coverage',
coverage_basename)

(not sure if that last line is under 80 characters)

[BigBossZhiling, 2016/05/20 18:38:09]

Done.

+      coverage_host_file = os.path.join(
+          self._test_instance.CoverageDirectory(), coverage_basename)
+      extras['coverageFile'] = coverage_device_file
+
     if isinstance(test, list):

[jbudorick, 2016/05/17 00:07:33]

yes, test can be a list.

[BigBossZhiling, 2016/05/20 18:38:08]

Done.

       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)
 
       test_names, timeouts = zip(*(name_and_timeout(t) for t in test))
@@ skipping 67 matching lines @@
       for l in output:
         logging.info('  %s', l)
       if (not self._env.skip_clear_data
           and self._test_instance.package_info):
         device.ClearApplicationState(self._test_instance.package_info.package)
     else:
       logging.debug('raw output from %s:', test_display_name)
       for l in output:
         logging.debug('  %s', l)
 
+    if self._test_instance.CoverageDirectory():
+      device.PullFile(coverage_device_file, coverage_host_file)
+      device.RunShellCommand('rm -f %s' % coverage_device_file)

[mikecase (-- gone --), 2016/05/11 17:39:58]

Might* be faster to pull all of the files at the end of the test run instead of
after running each test.

[BigBossZhiling, 2016/05/20 18:38:08]

I was thinking of collecting ec files after calling runtests, instead of calling
runtest, but I find it pretty hard to bubble the 'device' object up a level.
https://code.google.com/p/chromium/codesearch#chromium/src/build/android/pyli...
, since it is using 'self._env.parallel_devices'.

     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