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 6bd06dd2fa16d608c61cc7894dd8547944ba404c..552379dd6cb768091eb12be22186f5bfa73df7aa 100644 |
--- a/build/android/pylib/local/device/local_device_gtest_run.py |
+++ b/build/android/pylib/local/device/local_device_gtest_run.py |
@@ -388,17 +388,19 @@ class LocalDeviceGtestRun(local_device_test_run.LocalDeviceTestRun): |
dir=self._delegate.ResultsDirectory(device), |
suffix='.xml') as device_tmp_results_file: |
- flags = self._test_instance.test_arguments or '' |
+ flags = list(self._test_instance.flags) |
if self._test_instance.enable_xml_result_parsing: |
- flags += ' --gtest_output=xml:%s' % device_tmp_results_file.name |
- if self._test_instance.gtest_also_run_disabled_tests: |
- flags += ' --gtest_also_run_disabled_tests' |
+ flags.append('--gtest_output=xml:%s' % device_tmp_results_file.name) |
+ |
+ logging.info('flags:') |
+ for f in flags: |
+ logging.info(' %s', f) |
with contextlib_ext.Optional( |
trace_event.trace(str(test)), |
self._env.trace_output): |
output = self._delegate.Run( |
- test, device, flags=flags, |
+ test, device, flags=' '.join(flags), |
timeout=timeout, retries=0) |
if self._test_instance.enable_xml_result_parsing: |