| 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 re | 5 import re |
| 6 | 6 |
| 7 from recipe_engine import recipe_api | 7 from recipe_engine import recipe_api |
| 8 from recipe_engine import util as recipe_util | 8 from recipe_engine import util as recipe_util |
| 9 | 9 |
| 10 class TestLauncherFilterFileInputPlaceholder(recipe_util.InputPlaceholder): | 10 class TestLauncherFilterFileInputPlaceholder(recipe_util.InputPlaceholder): |
| (...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 573 data = '\n'.join(sorted_isolated_targets) + '\n' | 573 data = '\n'.join(sorted_isolated_targets) + '\n' |
| 574 args += ['--swarming-targets-file', self.m.raw_io.input(data)] | 574 args += ['--swarming-targets-file', self.m.raw_io.input(data)] |
| 575 | 575 |
| 576 if android_version_code: | 576 if android_version_code: |
| 577 args += ['--android-version-code=%s' % android_version_code] | 577 args += ['--android-version-code=%s' % android_version_code] |
| 578 if android_version_name: | 578 if android_version_name: |
| 579 args += ['--android-version-name=%s' % android_version_name] | 579 args += ['--android-version-name=%s' % android_version_name] |
| 580 | 580 |
| 581 args += [build_dir] | 581 args += [build_dir] |
| 582 | 582 |
| 583 # This runs with no env being passed along, so we get a clean environment | 583 # This runs with an almost-bare env being passed along, so we get a clean |
| 584 # without any GYP_DEFINES being present to cause confusion. | 584 # environment without any GYP_DEFINES being present to cause confusion. |
| 585 kwargs = { | 585 kwargs = { |
| 586 'name': name or 'generate_build_files', | 586 'name': name or 'generate_build_files', |
| 587 'script': self.m.path['checkout'].join('tools', 'mb', 'mb.py'), | 587 'script': self.m.path['checkout'].join('tools', 'mb', 'mb.py'), |
| 588 'args': args, | 588 'args': args, |
| 589 'env': { |
| 590 'GOMA_SERVICE_ACCOUNT_JSON_FILE': self.m.goma.service_account_json_path, |
| 591 } |
| 589 } | 592 } |
| 590 if self.c.TARGET_CROS_BOARD: | 593 if self.c.TARGET_CROS_BOARD: |
| 591 # Wrap 'runhooks' through 'cros chrome-sdk' | 594 # Wrap 'runhooks' through 'cros chrome-sdk' |
| 592 kwargs['wrapper'] = self.get_cros_chrome_sdk_wrapper(clean=True) | 595 kwargs['wrapper'] = self.get_cros_chrome_sdk_wrapper(clean=True) |
| 593 | 596 |
| 594 self.m.python(**kwargs) | 597 self.m.python(**kwargs) |
| 595 | 598 |
| 596 # Comes after self.m.python so the log appears in the correct step result. | 599 # Comes after self.m.python so the log appears in the correct step result. |
| 597 result = self.m.step.active_result | 600 result = self.m.step.active_result |
| 598 if isolated_targets and result: | 601 if isolated_targets and result: |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 717 })) | 720 })) |
| 718 | 721 |
| 719 def get_annotate_by_test_name(self, test_name): | 722 def get_annotate_by_test_name(self, test_name): |
| 720 return 'graphing' | 723 return 'graphing' |
| 721 | 724 |
| 722 def download_lto_plugin(self): | 725 def download_lto_plugin(self): |
| 723 return self.m.python( | 726 return self.m.python( |
| 724 name='download LTO plugin', | 727 name='download LTO plugin', |
| 725 script=self.m.path['checkout'].join( | 728 script=self.m.path['checkout'].join( |
| 726 'build', 'download_gold_plugin.py')) | 729 'build', 'download_gold_plugin.py')) |
| OLD | NEW |