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

Unified Diff: testing/scripts/telemetry_perf_unittests.py

Issue 1128733002: Update from https://crrev.com/328418 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « testing/commit_queue/config.json ('k') | third_party/libevent/README.chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/scripts/telemetry_perf_unittests.py
diff --git a/testing/scripts/telemetry_perf_unittests.py b/testing/scripts/telemetry_perf_unittests.py
index 42eb656e164acdcb66d9b6a34fa2272c31bd5079..06e018136c1655dac9d7e1ebe230b425139237b9 100755
--- a/testing/scripts/telemetry_perf_unittests.py
+++ b/testing/scripts/telemetry_perf_unittests.py
@@ -16,16 +16,20 @@ def main_run(args):
if args.filter_file:
filter_tests = json.load(args.filter_file)
+ test_args = ['--retry-limit', '3']
+ if 'android' == args.properties.get('target_platform'):
+ test_args += ['--browser', 'android-chrome-shell', '--device', 'android']
+ else:
+ test_args += ['--browser', args.build_config_fs.lower()]
+
with common.temporary_file() as tempfile_path:
+ test_args += ['--write-full-results-to', tempfile_path]
rc = common.run_runtest(args, [
'--annotate', 'gtest',
'--test-type', 'telemetry_perf_unittests',
'--run-python-script',
- os.path.join(common.SRC_DIR, 'tools', 'perf', 'run_tests'),
- '--browser', args.build_config_fs.lower(),
- '--retry-limit', '3',
- '--write-full-results-to', tempfile_path,
- ] + filter_tests)
+ os.path.join(common.SRC_DIR, 'tools', 'perf', 'run_tests')
+ ] + test_args + filter_tests)
with open(tempfile_path) as f:
results = json.load(f)
@@ -43,7 +47,10 @@ def main_run(args):
def main_compile_targets(args):
- json.dump(['chrome'], args.output)
+ if 'android' == args.properties.get('target_platform'):
+ json.dump(['chrome_shell_apk'], args.output)
+ else:
+ json.dump(['chrome'], args.output)
if __name__ == '__main__':
« no previous file with comments | « testing/commit_queue/config.json ('k') | third_party/libevent/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698