Android Add _incremental targets for instrumentation tests

build/android/pylib/gtest/gtest_test_instance.py

 # Copyright 2014 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 tempfile
 
 from devil.android import apk_helper
@@ skipping 120 matching lines @@
   def __init__(self, args, isolate_delegate, error_func):
     super(GtestTestInstance, self).__init__()
     # TODO(jbudorick): Support multiple test suites.
     if len(args.suite_name) > 1:
       raise ValueError('Platform mode currently supports only 1 gtest suite')
     self._extract_test_list_from_filter = args.extract_test_list_from_filter
     self._shard_timeout = args.shard_timeout
     self._skip_clear_data = args.skip_clear_data
     self._suite = args.suite_name[0]
 
-    incremental_part = '_incremental' if args.incremental_install else ''
+    self._exe_path = os.path.join(constants.GetOutDirectory(),
+                                  self._suite)
+
+    incremental_part = '_incremental' if args.test_apk_install_script else ''
     apk_path = os.path.join(
         constants.GetOutDirectory(), '%s_apk' % self._suite,
         '%s-debug%s.apk' % (self._suite, incremental_part))
-    self._exe_path = os.path.join(constants.GetOutDirectory(),
-                                  self._suite)
+    self._test_apk_install_script = args.test_apk_install_script
     if not os.path.exists(apk_path):
       self._apk_helper = None
     else:
       self._apk_helper = apk_helper.ApkHelper(apk_path)
       self._extras = {
           _EXTRA_NATIVE_TEST_ACTIVITY: self._apk_helper.GetActivityName(),
       }
       if self._suite in RUN_IN_SUB_THREAD_TEST_SUITES:
         self._extras[_EXTRA_RUN_IN_SUB_THREAD] = 1
       if self._suite in BROWSER_TEST_SUITES:
@@ skipping 93 matching lines @@
 
   @property
   def skip_clear_data(self):
     return self._skip_clear_data
 
   @property
   def suite(self):
     return self._suite
 
   @property
+  def test_apk_install_script(self):

[jbudorick, 2016/02/09 20:08:26]

Hm. These don't really belong in the test_instance, as they're not generic to
gtests but instead are specific to (gtest + local) (and similarly for the
instrumentation ones)

Unfortunately, in my limited wisdom, I didn't give the arguments to the
test_runs at construction time, so I guess I'm ok with this for now.

+    return self._test_apk_install_script
+
+  @property
   def test_arguments(self):
     return self._test_arguments
 
   @property
   def extract_test_list_from_filter(self):
     return self._extract_test_list_from_filter
 
   #override
   def TestType(self):
     return 'gtest'
@@ skipping 99 matching lines @@
         result_type = None
 
     return results
 
   #override
   def TearDown(self):
     """Clear the mappings created by SetUp."""
     if self._isolate_delegate:
       self._isolate_delegate.Clear()