Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-08 16:43:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use rustup.rs instead of custom bootstrap

Browse source 
Fixes #11361, closes #18874
This commit is contained in:
Simon Sapin 2017-11-27 18:02:53 +01:00
parent 6dff251e35
commit 365a139716
11 changed files with 125 additions and 362 deletions
Download patch file Download diff file Expand all files Collapse all files

18
python/servo/testing_commands.py
View file

@ -34,7 +34,7 @@ from mach.decorators import (
from servo.command_base import (
BuildNotFound, CommandBase,
call, cd, check_call, set_osmesa_env,
call, check_call, set_osmesa_env,
)
from servo.util import host_triple
@ -265,7 +265,7 @@ class MachCommands(CommandBase):
features = self.servo_features()
if len(packages) > 0:
args = ["cargo", "bench" if bench else "test"]
args = ["cargo", "bench" if bench else "test", "--manifest-path", self.servo_manifest()]
for crate in packages:
args += ["-p", "%s_tests" % crate]
for crate in in_crate_packages:
@ -278,7 +278,7 @@ class MachCommands(CommandBase):
if nocapture:
args += ["--", "--nocapture"]
err = call(args, env=env, cwd=self.servo_crate())
err = self.call_rustup_run(args, env=env)
if err is not 0:
return err
@ -290,17 +290,19 @@ class MachCommands(CommandBase):
@CommandArgument('--release', default=False, action="store_true",
help="Run with a release build of servo")
def test_stylo(self, release=False, test_name=None):
self.set_use_stable_rust()
self.set_use_geckolib_toolchain()
self.ensure_bootstrapped()
env = self.build_env()
env["RUST_BACKTRACE"] = "1"
env["CARGO_TARGET_DIR"] = path.join(self.context.topdir, "target", "geckolib").encode("UTF-8")
args = (["cargo", "test", "-p", "stylo_tests"] +
(["--release"] if release else []) + (test_name or []))
with cd(path.join("ports", "geckolib")):
return call(args, env=env)
args = (
["cargo", "test", "--manifest-path", self.geckolib_manifest(), "-p", "stylo_tests"] +
(["--release"] if release else []) +
(test_name or [])
)
return self.call_rustup_run(args, env=env)
@Command('test-content',
description='Run the content tests',