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

Side by Side Diff: scripts/slave/recipe_modules/chromium_android/api.py

Issue 1821973002: Revert of Create symlink to adb in home dir right before device setup. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/cronet/example.expected/local_test.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import contextlib 5 import contextlib
6 import datetime 6 import datetime
7 import json 7 import json
8 import os 8 import os
9 import re 9 import re
10 import urllib 10 import urllib
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 # (or at least make the difference clear). 256 # (or at least make the difference clear).
257 self.m.archive.zip_and_upload_build( 257 self.m.archive.zip_and_upload_build(
258 'zip_build', 258 'zip_build',
259 target=self.m.chromium.c.BUILD_CONFIG, 259 target=self.m.chromium.c.BUILD_CONFIG,
260 # We send None as the path so that zip_build.py gets it from factory 260 # We send None as the path so that zip_build.py gets it from factory
261 # properties. 261 # properties.
262 build_url=None, 262 build_url=None,
263 src_dir=self.m.path['slave_build'].join('src'), 263 src_dir=self.m.path['slave_build'].join('src'),
264 exclude_files='lib.target,gen,android_webview,jingle_unittests') 264 exclude_files='lib.target,gen,android_webview,jingle_unittests')
265 265
266 def create_adb_symlink(self):
267 # Creates a sym link to the adb executable in the home dir
268 self.m.python(
269 'create adb symlink',
270 self.m.path['checkout'].join('build', 'symlink.py'),
271 ['-f', self.m.adb.adb_path(), os.path.join('~', 'adb')],
272 infra_step=True)
273
274 def spawn_logcat_monitor(self): 266 def spawn_logcat_monitor(self):
275 self.m.step( 267 self.m.step(
276 'spawn_logcat_monitor', 268 'spawn_logcat_monitor',
277 [self.package_repo_resource('scripts', 'slave', 'daemonizer.py'), 269 [self.package_repo_resource('scripts', 'slave', 'daemonizer.py'),
278 '--', self.c.cr_build_android.join('adb_logcat_monitor.py'), 270 '--', self.c.cr_build_android.join('adb_logcat_monitor.py'),
279 self.m.chromium.c.build_dir.join('logcat')], 271 self.m.chromium.c.build_dir.join('logcat')],
280 env=self.m.chromium.get_env(), 272 env=self.m.chromium.get_env(),
281 infra_step=True) 273 infra_step=True)
282 274
283 def spawn_device_monitor(self): 275 def spawn_device_monitor(self):
(...skipping 563 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 os.remove(report) 839 os.remove(report)
848 """, 840 """,
849 args=[self.m.path['checkout'].join('out', 841 args=[self.m.path['checkout'].join('out',
850 self.m.chromium.c.BUILD_CONFIG, 842 self.m.chromium.c.BUILD_CONFIG,
851 'test_logs', 843 'test_logs',
852 '*.log')], 844 '*.log')],
853 ) 845 )
854 846
855 def common_tests_setup_steps(self, perf_setup=False, 847 def common_tests_setup_steps(self, perf_setup=False,
856 remove_system_webview=False): 848 remove_system_webview=False):
857 self.create_adb_symlink()
858 if self.c.gce_setup: 849 if self.c.gce_setup:
859 self.launch_gce_instances(snapshot=self.c.gce_snapshot, count=self.c.gce_c ount) 850 self.launch_gce_instances(snapshot=self.c.gce_snapshot, count=self.c.gce_c ount)
860 self.spawn_logcat_monitor() 851 self.spawn_logcat_monitor()
861 self.provision_devices(emulators=True, 852 self.provision_devices(emulators=True,
862 remove_system_webview=remove_system_webview) 853 remove_system_webview=remove_system_webview)
863 else: 854 else:
864 self.spawn_logcat_monitor() 855 self.spawn_logcat_monitor()
865 self.authorize_adb_devices() 856 self.authorize_adb_devices()
866 self.device_status_check() 857 self.device_status_check()
867 if perf_setup: 858 if perf_setup:
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
1248 def test_runner(self, step_name, args=None, **kwargs): 1239 def test_runner(self, step_name, args=None, **kwargs):
1249 """Wrapper for the python testrunner script. 1240 """Wrapper for the python testrunner script.
1250 1241
1251 Args: 1242 Args:
1252 step_name: Name of the step. 1243 step_name: Name of the step.
1253 args: Testrunner arguments. 1244 args: Testrunner arguments.
1254 """ 1245 """
1255 with self.handle_exit_codes(): 1246 with self.handle_exit_codes():
1256 return self.m.python( 1247 return self.m.python(
1257 step_name, self.c.test_runner, args, **kwargs) 1248 step_name, self.c.test_runner, args, **kwargs)
OLDNEW
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/cronet/example.expected/local_test.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698