mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not test RLS and rustfmt if build of these failed.

Browse Source 
Avoid a tool being simultaneously test-pass and build-fail.
This commit is contained in:
kennytm 2018-04-21 00:53:36 +08:00
parent 6586074426
commit 27d9691d80
No known key found for this signature in database
GPG Key ID: FEF6C8051D0E013C
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/bootstrap/test.rs
View File

@ -241,7 +241,16 @@ impl Step for Rls {
let host = self.host;
let compiler = builder.compiler(stage, host);
builder.ensure(tool::Rls { compiler, target: self.host, extra_features: Vec::new() });
let build_result = builder.ensure(tool::Rls {
compiler,
target: self.host,
extra_features: Vec::new(),
});
if build_result.is_none() {
eprintln!("failed to test rls: could not build");
return;
}
let mut cargo = tool::prepare_tool_cargo(builder,
compiler,
host,
@ -286,7 +295,16 @@ impl Step for Rustfmt {
let host = self.host;
let compiler = builder.compiler(stage, host);
builder.ensure(tool::Rustfmt { compiler, target: self.host, extra_features: Vec::new() });
let build_result = builder.ensure(tool::Rustfmt {
compiler,
target: self.host,
extra_features: Vec::new(),
});
if build_result.is_none() {
eprintln!("failed to test rustfmt: could not build");
return;
}
let mut cargo = tool::prepare_tool_cargo(builder,
compiler,
host,