diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-09-08 08:41:05 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-09-08 08:41:05 -0600 |
| commit | c44213219668d054ed267ac29a2513309b342e5f (patch) | |
| tree | 088c1a0fae3ed0469c5a83ea0dd15780abb5d244 /python | |
| parent | ef8a145233e17e80134a514304cf15cbd4352e0c (diff) | |
| parent | adbc6d045bc3d33e05793b00ec911dac21bcaa00 (diff) | |
| download | servo-c44213219668d054ed267ac29a2513309b342e5f.tar.gz servo-c44213219668d054ed267ac29a2513309b342e5f.zip | |
Auto merge of #7494 - wilmoz:upgradeWptRunner, r=jdm
Add a mach command to upgrade wptrunner
https://github.com/servo/servo/issues/7491
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7494)
<!-- Reviewable:end -->
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/devenv_commands.py | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/python/servo/devenv_commands.py b/python/servo/devenv_commands.py index 65251323bbb..7c43f7b3b38 100644 --- a/python/servo/devenv_commands.py +++ b/python/servo/devenv_commands.py @@ -132,3 +132,20 @@ class MachCommands(CommandBase): return subprocess.call( ["git"] + ["grep"] + params + ['--'] + grep_paths + [':(exclude)*.min.js'], env=self.build_env()) + + @Command('wpt-upgrade', + description='upgrade wptrunner.', + category='devenv') + def upgrade_wpt_runner(self): + with cd(path.join(self.context.topdir, 'tests', 'wpt', 'harness')): + code = subprocess.call(["git", "init"], env=self.build_env()) + if code: + return code + subprocess.call( + ["git", "remote", "add", "upstream", "https://github.com/w3c/wptrunner.git"], env=self.build_env()) + code = subprocess.call(["git", "fetch", "upstream"], env=self.build_env()) + if code: + return code + code = subprocess.call(["git", "reset", '--', "hard", "remotes/upstream/master"], env=self.build_env()) + if code: + return code |