Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1477)

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py

Issue 2613753002: W3C import: Update manifest-updating step after upstream changes. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py
index 5d0a82d5f2694c95abe1366073223b13fbe99fc6..56ab91e3f7a3f50496f7375b3528b578db23059c 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py
@@ -149,17 +149,21 @@ class DepsUpdater(object):
self.run(['git', 'add', destination])
def _generate_manifest(self, original_repo_path, dest_path):
- """Generate MANIFEST.json for imported tests.
+ """Generates MANIFEST.json for imported tests.
- Run 'manifest' command if it exists in original_repo_path, and
- add generated MANIFEST.json to dest_path.
+ Args:
+ original_repo_path: Path to the temporary source WPT repo directory.
+ dest_path: Path to the destination WPT directory.
+
+ Runs the (newly-updated) manifest command if it's found, and then
+ stages the generated MANIFEST.json in the git index, ready to commit.
"""
manifest_command = self.fs.join(original_repo_path, 'manifest')
if not self.fs.exists(manifest_command):
# Do nothing for csswg-test.
return
_log.info('Generating MANIFEST.json')
- self.run([manifest_command, '--tests-root', dest_path])
+ self.run([manifest_command, '--work', '--tests-root', dest_path])
self.run(['git', 'add', self.fs.join(dest_path, 'MANIFEST.json')])
def update(self, dest_dir_name, url, keep_w3c_repos_around, revision):
« no previous file with comments | « no previous file | third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698