diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-21 13:54:19 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-21 13:54:19 +0530 |
| commit | 9c172f49d08fe9019b0ba193ea4d75c6ddb95cda (patch) | |
| tree | ffac368f1c9ed74b72c26ce51e261253ca75913b /python | |
| parent | 3bfa4cc7414fea760ce5c503bfbcf25262acb9d7 (diff) | |
| parent | 5944add496e5639e9930ab7ac3872b1212562758 (diff) | |
| download | servo-9c172f49d08fe9019b0ba193ea4d75c6ddb95cda.tar.gz servo-9c172f49d08fe9019b0ba193ea4d75c6ddb95cda.zip | |
Auto merge of #10631 - servo:wptrunner-20160415, r=KiChjang
Update wptrunner.
Fixes #10540.
Fixes #10392.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10631)
<!-- Reviewable:end -->
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/devenv_commands.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/python/servo/devenv_commands.py b/python/servo/devenv_commands.py index 4ad07477f3f..95bb2d054a9 100644 --- a/python/servo/devenv_commands.py +++ b/python/servo/devenv_commands.py @@ -152,11 +152,17 @@ class MachCommands(CommandBase): code = call(["git", "init"], env=self.build_env()) if code: return code - call( + code = call( ["git", "remote", "add", "upstream", "https://github.com/w3c/wptrunner.git"], env=self.build_env()) + if code: + return code code = call(["git", "fetch", "upstream"], env=self.build_env()) if code: return code - code = call(["git", "reset", '--', "hard", "remotes/upstream/master"], env=self.build_env()) + code = call(["git", "reset", "--hard", "remotes/upstream/master"], env=self.build_env()) + if code: + return code + code = call(["rm", "-rf", ".git"], env=self.build_env()) if code: return code + return 0 |