Index: build/android/pylib/local/device/local_device_gtest_run.py |
diff --git a/build/android/pylib/local/device/local_device_gtest_run.py b/build/android/pylib/local/device/local_device_gtest_run.py |
index e2c6a882e2fd1016b7d35cd3df0f3e1038ab5f72..05b144264d238760e024c9edbef1f9f1631ed665 100644 |
--- a/build/android/pylib/local/device/local_device_gtest_run.py |
+++ b/build/android/pylib/local/device/local_device_gtest_run.py |
@@ -354,7 +354,8 @@ class LocalDeviceGtestRun(local_device_test_run.LocalDeviceTestRun): |
logging.info('No tests found. Output:') |
for l in raw_test_list: |
logging.info(' %s', l) |
- tests = self._test_instance.FilterTests(tests) |
+ tests = self._test_instance.FilterTests( |
+ tests, None, self._test_instance.gtest_also_run_disabled_tests) |
return tests |
# Query all devices in case one fails. |
@@ -382,6 +383,8 @@ class LocalDeviceGtestRun(local_device_test_run.LocalDeviceTestRun): |
flags = self._test_instance.test_arguments or '' |
if self._test_instance.enable_xml_result_parsing: |
flags += ' --gtest_output=xml:%s' % device_tmp_results_file.name |
+ flags += ' --gtest_also_run_disabled_tests=%r' % ( |
+ self._test_instance.gtest_also_run_disabled_tests) |
jbudorick
2016/11/30 21:05:56
This shouldn't need a value, you should just be ab
shenghuazhang
2016/11/30 21:58:01
Done.
|
output = self._delegate.Run( |
test, device, flags=flags, |