| 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 """Fetches a copy of the latest state of a W3C test repository and commits. | 5 """Fetches a copy of the latest state of a W3C test repository and commits. |
| 6 | 6 |
| 7 If this script is given the argument --auto-update, it will also: | 7 If this script is given the argument --auto-update, it will also: |
| 8 1. Upload a CL. | 8 1. Upload a CL. |
| 9 2. Trigger try jobs and wait for them to complete. | 9 2. Trigger try jobs and wait for them to complete. |
| 10 3. Make any changes that are required for new failing tests. | 10 3. Make any changes that are required for new failing tests. |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 | 70 |
| 71 # TODO(qyearsley): Simplify this to use LocalWPT.fetch when csswg-test | 71 # TODO(qyearsley): Simplify this to use LocalWPT.fetch when csswg-test |
| 72 # is merged into web-platform-tests. | 72 # is merged into web-platform-tests. |
| 73 temp_repo_path = self.path_from_webkit_base(dest_dir_name) | 73 temp_repo_path = self.path_from_webkit_base(dest_dir_name) |
| 74 _log.info('Cloning %s into %s.', repo_url, temp_repo_path) | 74 _log.info('Cloning %s into %s.', repo_url, temp_repo_path) |
| 75 self.run(['git', 'clone', repo_url, temp_repo_path]) | 75 self.run(['git', 'clone', repo_url, temp_repo_path]) |
| 76 | 76 |
| 77 if options.target == 'wpt': | 77 if options.target == 'wpt': |
| 78 commits = self.exportable_but_not_exported_commits(temp_repo_path) | 78 commits = self.exportable_but_not_exported_commits(temp_repo_path) |
| 79 if commits: | 79 if commits: |
| 80 _log.error('There were exportable but not-yet-exported commits:
%r', commits) | 80 _log.error('There were exportable but not-yet-exported commits:'
) |
| 81 for commit in commits: |
| 82 _log.error(' https://chromium.googlesource.com/chromium/src
/+/%s', commit.sha) |
| 81 _log.error('Aborting import to prevent clobbering these commits.
') | 83 _log.error('Aborting import to prevent clobbering these commits.
') |
| 82 return 1 | 84 return 1 |
| 83 | 85 |
| 84 import_commit = self.update(dest_dir_name, temp_repo_path, options.keep_
w3c_repos_around, options.revision) | 86 import_commit = self.update(dest_dir_name, temp_repo_path, options.keep_
w3c_repos_around, options.revision) |
| 85 | 87 |
| 86 if options.target == 'wpt': | 88 if options.target == 'wpt': |
| 87 self._copy_resources() | 89 self._copy_resources() |
| 88 | 90 |
| 89 has_changes = self._has_changes() | 91 has_changes = self._has_changes() |
| 90 if not has_changes: | 92 if not has_changes: |
| (...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 437 """Returns a dict mapping source to dest name for layout tests that have
been renamed.""" | 439 """Returns a dict mapping source to dest name for layout tests that have
been renamed.""" |
| 438 out = self.check_run(['git', 'diff', 'origin/master', '-M100%', '--diff-
filter=R', '--name-status']) | 440 out = self.check_run(['git', 'diff', 'origin/master', '-M100%', '--diff-
filter=R', '--name-status']) |
| 439 renamed_tests = {} | 441 renamed_tests = {} |
| 440 for line in out.splitlines(): | 442 for line in out.splitlines(): |
| 441 _, source_path, dest_path = line.split() | 443 _, source_path, dest_path = line.split() |
| 442 source_test = self.finder.layout_test_name(source_path) | 444 source_test = self.finder.layout_test_name(source_path) |
| 443 dest_test = self.finder.layout_test_name(dest_path) | 445 dest_test = self.finder.layout_test_name(dest_path) |
| 444 if source_test and dest_test: | 446 if source_test and dest_test: |
| 445 renamed_tests[source_test] = dest_test | 447 renamed_tests[source_test] = dest_test |
| 446 return renamed_tests | 448 return renamed_tests |
| OLD | NEW |