Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5012)

Unified Diff: build/android/pylib/local/device/local_device_gtest_run.py

Issue 2752493002: [android] Add support for passing command-line flags directly. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 82da53546278d9ae7e8859d07a9a60e9033f4c86..f17dfceb883124d004869f4b5717d310a73e8348 100644
--- a/build/android/pylib/local/device/local_device_gtest_run.py
+++ b/build/android/pylib/local/device/local_device_gtest_run.py
@@ -384,17 +384,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:

Powered by Google App Engine
This is Rietveld 408576698