| 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 608 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 619 args += [build_dir] | 619 args += [build_dir] |
| 620 | 620 |
| 621 # This runs with an almost-bare env being passed along, so we get a clean | 621 # This runs with an almost-bare env being passed along, so we get a clean |
| 622 # environment without any GYP_DEFINES being present to cause confusion. | 622 # environment without any GYP_DEFINES being present to cause confusion. |
| 623 step_kwargs = { | 623 step_kwargs = { |
| 624 'name': name or 'generate_build_files', | 624 'name': name or 'generate_build_files', |
| 625 'script': self.m.path['checkout'].join('tools', 'mb', 'mb.py'), | 625 'script': self.m.path['checkout'].join('tools', 'mb', 'mb.py'), |
| 626 'args': args, | 626 'args': args, |
| 627 'env': { | 627 'env': { |
| 628 'GOMA_SERVICE_ACCOUNT_JSON_FILE': self.m.goma.service_account_json_path, | 628 'GOMA_SERVICE_ACCOUNT_JSON_FILE': self.m.goma.service_account_json_path, |
| 629 } | 629 }, |
| 630 'cwd': self.m.path['checkout'], |
| 630 } | 631 } |
| 631 if self.c.env.FORCE_MAC_TOOLCHAIN: | 632 if self.c.env.FORCE_MAC_TOOLCHAIN: |
| 632 step_kwargs['env']['FORCE_MAC_TOOLCHAIN'] = ( | 633 step_kwargs['env']['FORCE_MAC_TOOLCHAIN'] = ( |
| 633 self.c.env.FORCE_MAC_TOOLCHAIN) | 634 self.c.env.FORCE_MAC_TOOLCHAIN) |
| 634 | 635 |
| 635 if self.c.gyp_env.GYP_MSVS_VERSION: | 636 if self.c.gyp_env.GYP_MSVS_VERSION: |
| 636 # TODO(machenbach): Remove this as soon as it's not read anymore by | 637 # TODO(machenbach): Remove this as soon as it's not read anymore by |
| 637 # vs_toolchain.py (currently called by gn). | 638 # vs_toolchain.py (currently called by gn). |
| 638 step_kwargs['env']['GYP_MSVS_VERSION'] = ( | 639 step_kwargs['env']['GYP_MSVS_VERSION'] = ( |
| 639 self.c.gyp_env.GYP_MSVS_VERSION) | 640 self.c.gyp_env.GYP_MSVS_VERSION) |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 776 })) | 777 })) |
| 777 | 778 |
| 778 def get_annotate_by_test_name(self, test_name): | 779 def get_annotate_by_test_name(self, test_name): |
| 779 return 'graphing' | 780 return 'graphing' |
| 780 | 781 |
| 781 def download_lto_plugin(self): | 782 def download_lto_plugin(self): |
| 782 return self.m.python( | 783 return self.m.python( |
| 783 name='download LTO plugin', | 784 name='download LTO plugin', |
| 784 script=self.m.path['checkout'].join( | 785 script=self.m.path['checkout'].join( |
| 785 'build', 'download_gold_plugin.py')) | 786 'build', 'download_gold_plugin.py')) |
| OLD | NEW |