Fixed coverage dir for instrumentation tests.

build/android/pylib/instrumentation/instrumentation_test_instance.py

Index: build/android/pylib/instrumentation/instrumentation_test_instance.py
diff --git a/build/android/pylib/instrumentation/instrumentation_test_instance.py b/build/android/pylib/instrumentation/instrumentation_test_instance.py
index 610f084ba054b787488f49cc00ef860143db3396..502167bc3e5190e31b98ecd40099fe5f9cc2b8f0 100644
--- a/build/android/pylib/instrumentation/instrumentation_test_instance.py
+++ b/build/android/pylib/instrumentation/instrumentation_test_instance.py
@@ -239,6 +239,9 @@ class InstrumentationTestInstance(test_instance.TestInstance):
     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
@@ -388,6 +391,9 @@ class InstrumentationTestInstance(test_instance.TestInstance):
   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
@@ -401,8 +407,8 @@ class InstrumentationTestInstance(test_instance.TestInstance):
     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):
@@ -417,6 +423,10 @@ class InstrumentationTestInstance(test_instance.TestInstance):
     return self._driver_name
 
   @property
+  def flags(self):
+    return self._flags
+
+  @property
   def package_info(self):
     return self._package_info