OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 collections | 5 import collections |
6 import contextlib | 6 import contextlib |
7 import copy | 7 import copy |
8 import itertools | 8 import itertools |
9 import json | 9 import json |
10 | 10 |
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
492 # build was not used at all, leading to confusion why source code changes | 492 # build was not used at all, leading to confusion why source code changes |
493 # are not taking effect. | 493 # are not taking effect. |
494 # | 494 # |
495 # The best way to ensure the old build directory is not used is to | 495 # The best way to ensure the old build directory is not used is to |
496 # remove it. | 496 # remove it. |
497 self.m.file.rmtree( | 497 self.m.file.rmtree( |
498 'build directory', | 498 'build directory', |
499 self.m.chromium.c.build_dir.join(self.m.chromium.c.build_config_fs)) | 499 self.m.chromium.c.build_dir.join(self.m.chromium.c.build_config_fs)) |
500 | 500 |
501 legacy_build_url = None | 501 legacy_build_url = None |
| 502 got_revision = update_step.presentation.properties['got_revision'] |
502 build_revision = build_revision or self.m.properties.get( | 503 build_revision = build_revision or self.m.properties.get( |
503 'parent_got_revision') or update_step.presentation.properties[ | 504 'parent_got_revision') or got_revision |
504 'got_revision'] | |
505 build_archive_url = build_archive_url or self.m.properties.get( | 505 build_archive_url = build_archive_url or self.m.properties.get( |
506 'parent_build_archive_url') | 506 'parent_build_archive_url') |
507 if build_archive_url is None: | 507 if build_archive_url is None: |
508 master_config = bot_db.get_master_settings(mastername) | 508 master_config = bot_db.get_master_settings(mastername) |
509 legacy_build_url = self._make_legacy_build_url(master_config, mastername) | 509 legacy_build_url = self._make_legacy_build_url(master_config, mastername) |
510 | 510 |
511 self.m.archive.download_and_unzip_build( | 511 self.m.archive.download_and_unzip_build( |
512 step_name='extract build', | 512 step_name='extract build', |
513 target=self.m.chromium.c.build_config_fs, | 513 target=self.m.chromium.c.build_config_fs, |
514 build_url=legacy_build_url, | 514 build_url=legacy_build_url, |
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
838 def get_compile_targets_for_scripts(self): | 838 def get_compile_targets_for_scripts(self): |
839 return self.m.python( | 839 return self.m.python( |
840 name='get compile targets for scripts', | 840 name='get compile targets for scripts', |
841 script=self.m.path['checkout'].join( | 841 script=self.m.path['checkout'].join( |
842 'testing', 'scripts', 'get_compile_targets.py'), | 842 'testing', 'scripts', 'get_compile_targets.py'), |
843 args=[ | 843 args=[ |
844 '--output', self.m.json.output(), | 844 '--output', self.m.json.output(), |
845 '--', | 845 '--', |
846 ] + self.get_common_args_for_scripts(), | 846 ] + self.get_common_args_for_scripts(), |
847 step_test_data=lambda: self.m.json.test_api.output({})) | 847 step_test_data=lambda: self.m.json.test_api.output({})) |
OLD | NEW |