aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo/devenv_commands.py
diff options
context:
space:
mode:
Diffstat (limited to 'python/servo/devenv_commands.py')
-rw-r--r--python/servo/devenv_commands.py15
1 files changed, 9 insertions, 6 deletions
diff --git a/python/servo/devenv_commands.py b/python/servo/devenv_commands.py
index 8163340c501..8618041b756 100644
--- a/python/servo/devenv_commands.py
+++ b/python/servo/devenv_commands.py
@@ -170,25 +170,28 @@ class MachCommands(CommandBase):
print(cargo_path)
call(["cargo", "fetch"], env=self.build_env())
- @Command('wpt-upgrade',
+ @Command('wptrunner-upgrade',
description='upgrade wptrunner.',
category='devenv')
def upgrade_wpt_runner(self):
+ env = self.build_env()
with cd(path.join(self.context.topdir, 'tests', 'wpt', 'harness')):
- code = call(["git", "init"], env=self.build_env())
+ code = call(["git", "init"], env=env)
if code:
return code
+ # No need to report an error if this fails, as it will for the first use
+ call(["git", "remote", "rm", "upstream"], env=env)
code = call(
- ["git", "remote", "add", "upstream", "https://github.com/w3c/wptrunner.git"], env=self.build_env())
+ ["git", "remote", "add", "upstream", "https://github.com/w3c/wptrunner.git"], env=env)
if code:
return code
- code = call(["git", "fetch", "upstream"], env=self.build_env())
+ code = call(["git", "fetch", "upstream"], env=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=env)
if code:
return code
- code = call(["rm", "-rf", ".git"], env=self.build_env())
+ code = call(["rm", "-rf", ".git"], env=env)
if code:
return code
return 0