Fixed coverage dir for instrumentation tests.

build/android/pylib/instrumentation/instrumentation_test_instance.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 collections
 import copy
 import logging
 import os
 import pickle
 import re
@@ skipping 221 matching lines @@
     self._initializeFlagAttributes(args)
 
     self._driver_apk = None
     self._driver_package = None
     self._driver_name = None
     self._initializeDriverAttributes()
 
     self._timeout_scale = None
     self._initializeTestControlAttributes(args)
 
+    self._coverage_directory = None
+    self._initializeTestCoverageAttributes(args)
+
   def _initializeApkAttributes(self, args, error_func):
     if args.apk_under_test:
       apk_under_test_path = args.apk_under_test
       if not args.apk_under_test.endswith('.apk'):
         apk_under_test_path = os.path.join(
             constants.GetOutDirectory(), constants.SDK_BUILD_APKS_DIR,
             '%s.apk' % args.apk_under_test)
 
       if not os.path.exists(apk_under_test_path):
         error_func('Unable to find APK under test: %s' % apk_under_test_path)
@@ skipping 129 matching lines @@
     if os.path.exists(self._driver_apk):
       driver_apk = apk_helper.ApkHelper(self._driver_apk)
       self._driver_package = driver_apk.GetPackageName()
       self._driver_name = driver_apk.GetInstrumentationName()
     else:
       self._driver_apk = None
 
   def _initializeTestControlAttributes(self, args):
     self._timeout_scale = args.timeout_scale or 1
 
+  def _initializeTestCoverageAttributes(self, args):
+    self._coverage_directory = args.coverage_dir

[mikecase (-- gone --), 2016/05/20 21:00:41]

There doesnt seem like there is a coverage_dir arg for instrumentation tests?

[BigBossZhiling, 2016/05/20 21:08:05]

args.coverage_dir is the directory. It is not true and false.

[mikecase (wrong mikecase), 2016/05/20 21:26:23]

oops, I missed that --coverage-dir is defined for instr tests.

+
   @property
   def additional_apks(self):
     return self._additional_apks
 
   @property
   def apk_under_test(self):
     return self._apk_under_test
 
   @property
   def apk_under_test_incremental_install_script(self):
     return self._apk_under_test_incremental_install_script
 
   @property
-  def flags(self):
-    return self._flags
+  def coverage_directory(self):
+    return self._coverage_directory
 
   @property
   def driver_apk(self):
     return self._driver_apk
 
   @property
   def driver_package(self):
     return self._driver_package
 
   @property
   def driver_name(self):
     return self._driver_name
 
   @property
+  def flags(self):
+    return self._flags
+
+  @property
   def package_info(self):
     return self._package_info
 
   @property
   def suite(self):
     return self._suite
 
   @property
   def test_apk(self):
     return self._test_apk
@@ skipping 226 matching lines @@
   def GenerateTestResults(
       result_code, result_bundle, statuses, start_ms, duration_ms):
     return GenerateTestResults(result_code, result_bundle, statuses,
                                start_ms, duration_ms)
 
   #override
   def TearDown(self):
     if self._isolate_delegate:
       self._isolate_delegate.Clear()