Chromium Code Reviews| 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 attempt to | 7 If this script is given the argument --auto-update, it will also attempt to |
| 8 upload a CL, triggery try jobs, and make any changes that are required for | 8 upload a CL, triggery try jobs, and make any changes that are required for |
| 9 new failing tests before committing. | 9 new failing tests before committing. |
| 10 """ | 10 """ |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 100 self.print_('## WebKit/%s repo exists; aborting.' % CSS_DEST_NAME) | 100 self.print_('## WebKit/%s repo exists; aborting.' % CSS_DEST_NAME) |
| 101 return False | 101 return False |
| 102 | 102 |
| 103 return True | 103 return True |
| 104 | 104 |
| 105 def _copy_resources_to_wpt(self): | 105 def _copy_resources_to_wpt(self): |
| 106 """Copies some files over to a newly-updated wpt directory. | 106 """Copies some files over to a newly-updated wpt directory. |
| 107 | 107 |
| 108 There are some resources in our repository that we use instead of the | 108 There are some resources in our repository that we use instead of the |
| 109 upstream versions. | 109 upstream versions. |
| 110 | |
| 111 If this list is changed, we should consider also consider changing the | |
| 112 lists of files expected to be identical in LayoutTests/PRESUBMIT.py. | |
| 110 """ | 113 """ |
| 111 resources_to_copy = [ | 114 resources_to_copy = [ |
| 112 ('testharnessreport.js', 'resources'), | 115 ('idlharness.js', 'resources'), |
|
qyearsley
2016/08/31 23:41:03
Looking at this here, I'm pretty sure that we *don
jsbell
2016/09/01 16:51:05
We *always* want to use "our" copy of testharnessr
| |
| 116 ('testharness.js', 'resources'), | |
| 113 ('WebIDLParser.js', 'resources'), | 117 ('WebIDLParser.js', 'resources'), |
| 114 ('vendor-prefix.js', 'common'), | 118 ('vendor-prefix.js', 'common'), |
| 115 ] | 119 ] |
| 116 for filename, wpt_subdir in resources_to_copy: | 120 for filename, wpt_subdir in resources_to_copy: |
| 117 source = self.path_from_webkit_base('LayoutTests', 'resources', file name) | 121 source = self.path_from_webkit_base('LayoutTests', 'resources', file name) |
| 118 destination = self.path_from_webkit_base('LayoutTests', 'imported', WPT_DEST_NAME, wpt_subdir, filename) | 122 destination = self.path_from_webkit_base('LayoutTests', 'imported', WPT_DEST_NAME, wpt_subdir, filename) |
| 119 self.copyfile(source, destination) | 123 self.copyfile(source, destination) |
| 120 self.run(['git', 'add', destination]) | 124 self.run(['git', 'add', destination]) |
| 121 | 125 |
| 122 def update(self, dest_dir_name, url, keep_w3c_repos_around): | 126 def update(self, dest_dir_name, url, keep_w3c_repos_around): |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 332 email_addresses.add(directory_to_owner[test_dir]) | 336 email_addresses.add(directory_to_owner[test_dir]) |
| 333 return sorted(email_addresses) | 337 return sorted(email_addresses) |
| 334 | 338 |
| 335 def write_test_expectations(self): | 339 def write_test_expectations(self): |
| 336 self.print_('## Adding test expectations lines to LayoutTests/TestExpect ations.') | 340 self.print_('## Adding test expectations lines to LayoutTests/TestExpect ations.') |
| 337 script_path = self.path_from_webkit_base('Tools', 'Scripts', 'update-w3c -test-expectations') | 341 script_path = self.path_from_webkit_base('Tools', 'Scripts', 'update-w3c -test-expectations') |
| 338 self.run([self.host.executable, script_path]) | 342 self.run([self.host.executable, script_path]) |
| 339 message = '\'Modifies TestExpectations and/or downloads new baselines fo r tests\'' | 343 message = '\'Modifies TestExpectations and/or downloads new baselines fo r tests\'' |
| 340 self.check_run(['git', 'commit', '-a', '-m', message]) | 344 self.check_run(['git', 'commit', '-a', '-m', message]) |
| 341 self.git_cl(['upload', '-m', message, '--rietveld']) | 345 self.git_cl(['upload', '-m', message, '--rietveld']) |
| OLD | NEW |