| OLD | NEW |
| 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 sys | 10 import sys |
| (...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 562 env=self.m.chromium.get_env()) | 562 env=self.m.chromium.get_env()) |
| 563 | 563 |
| 564 def _asan_device_setup(self, name, args): | 564 def _asan_device_setup(self, name, args): |
| 565 script = self.m.path['checkout'].join( | 565 script = self.m.path['checkout'].join( |
| 566 'tools', 'android', 'asan', 'third_party', 'asan_device_setup.sh') | 566 'tools', 'android', 'asan', 'third_party', 'asan_device_setup.sh') |
| 567 cmd = [script] + args | 567 cmd = [script] + args |
| 568 env = dict(self.m.chromium.get_env()) | 568 env = dict(self.m.chromium.get_env()) |
| 569 env['ADB'] = self.m.adb.adb_path() | 569 env['ADB'] = self.m.adb.adb_path() |
| 570 for d in self.devices: | 570 for d in self.devices: |
| 571 self.m.step('%s %s' % (name, d), | 571 self.m.step('%s %s' % (name, d), |
| 572 cmd + ['--device', d, '--use-su'], | 572 cmd + ['--device', d], |
| 573 infra_step=True, | 573 infra_step=True, |
| 574 env=env) | 574 env=env) |
| 575 | 575 |
| 576 def asan_device_setup(self): | 576 def asan_device_setup(self): |
| 577 args = [ | 577 args = [ |
| 578 '--lib', | 578 '--lib', |
| 579 self.m.path['checkout'].join( | 579 self.m.path['checkout'].join( |
| 580 'third_party', 'llvm-build', 'Release+Asserts', 'lib', 'clang', | 580 'third_party', 'llvm-build', 'Release+Asserts', 'lib', 'clang', |
| 581 # TODO(kjellander): Don't hardcode the clang version number here, | 581 # TODO(kjellander): Don't hardcode the clang version number here, |
| 582 # else the bot will break every time it changes. Instead, | 582 # else the bot will break every time it changes. Instead, |
| (...skipping 823 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1406 script = self.c.test_runner | 1406 script = self.c.test_runner |
| 1407 if wrapper_script_suite_name: | 1407 if wrapper_script_suite_name: |
| 1408 script = self.m.chromium.output_dir.join('bin', 'run_%s' % | 1408 script = self.m.chromium.output_dir.join('bin', 'run_%s' % |
| 1409 wrapper_script_suite_name) | 1409 wrapper_script_suite_name) |
| 1410 else: | 1410 else: |
| 1411 env = kwargs.get('env', {}) | 1411 env = kwargs.get('env', {}) |
| 1412 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', | 1412 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', |
| 1413 self.m.chromium.output_dir) | 1413 self.m.chromium.output_dir) |
| 1414 kwargs['env'] = env | 1414 kwargs['env'] = env |
| 1415 return self.m.python(step_name, script, args, **kwargs) | 1415 return self.m.python(step_name, script, args, **kwargs) |
| OLD | NEW |