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

Side by Side Diff: build/android/buildbot/bb_device_steps.py

Issue 22982007: [Android] Changes python_test_root to host-driven-root (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | build/android/test_runner.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 import collections 6 import collections
7 import glob 7 import glob
8 import multiprocessing 8 import multiprocessing
9 import os 9 import os
10 import shutil 10 import shutil
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 args = ['--test-apk', test.test_apk, '--test_data', test.test_data, 159 args = ['--test-apk', test.test_apk, '--test_data', test.test_data,
160 '--verbose'] 160 '--verbose']
161 if options.target == 'Release': 161 if options.target == 'Release':
162 args.append('--release') 162 args.append('--release')
163 if options.asan: 163 if options.asan:
164 args.append('--tool=asan') 164 args.append('--tool=asan')
165 if options.flakiness_server: 165 if options.flakiness_server:
166 args.append('--flakiness-dashboard-server=%s' % 166 args.append('--flakiness-dashboard-server=%s' %
167 options.flakiness_server) 167 options.flakiness_server)
168 if test.host_driven_root: 168 if test.host_driven_root:
169 args.append('--python_test_root=%s' % test.host_driven_root) 169 args.append('--host-driven-root=%s' % test.host_driven_root)
170 if test.annotation: 170 if test.annotation:
171 args.extend(['-A', test.annotation]) 171 args.extend(['-A', test.annotation])
172 if test.exclude_annotation: 172 if test.exclude_annotation:
173 args.extend(['-E', test.exclude_annotation]) 173 args.extend(['-E', test.exclude_annotation])
174 if test.extra_flags: 174 if test.extra_flags:
175 args.extend(test.extra_flags) 175 args.extend(test.extra_flags)
176 if python_only: 176 if python_only:
177 args.append('-p') 177 args.append('-p')
178 178
179 RunCmd(['build/android/test_runner.py', 'instrumentation'] + args, 179 RunCmd(['build/android/test_runner.py', 'instrumentation'] + args,
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 if unknown_tests: 378 if unknown_tests:
379 return sys.exit('Unknown tests %s' % list(unknown_tests)) 379 return sys.exit('Unknown tests %s' % list(unknown_tests))
380 380
381 setattr(options, 'target', options.factory_properties.get('target', 'Debug')) 381 setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
382 382
383 MainTestWrapper(options) 383 MainTestWrapper(options)
384 384
385 385
386 if __name__ == '__main__': 386 if __name__ == '__main__':
387 sys.exit(main(sys.argv)) 387 sys.exit(main(sys.argv))
OLDNEW
« no previous file with comments | « no previous file | build/android/test_runner.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698