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

Auto merge of #63199 - ehuss:fix-rustc-guide-toolstate, r=kennytm

Browse Source 
Fix rustc-guide toolstate tracking.

The rustc-guide is still not saving its toolstate.  It needs to be done explicitly.

Note: There are some confusing bits here, like without `--no-fail-fast`, it saves the wrong value in `toolstates.json`.  Also, "rustbook" is always added as "test-fail".  Presumably [this code](63c1f17d95/src/bootstrap/tool.rs (L201-L205)) assumes everything fails until it passes tests, which is a bit confusing for things that don't run tests.

cc @mark-i-m
This commit is contained in:
bors 2019-08-04 03:36:10 +00:00
commit 2c13edcd9d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bootstrap/test.rs
View File

@ -1527,7 +1527,12 @@ fn make_run(run: RunConfig<'_>) {
fn run(self, builder: &Builder<'_>) {
let src = builder.src.join("src/doc/rustc-guide");
let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook);
try_run(builder, rustbook_cmd.arg("linkcheck").arg(&src));
let toolstate = if try_run(builder, rustbook_cmd.arg("linkcheck").arg(&src)) {
ToolState::TestPass
} else {
ToolState::TestFail
};
builder.save_toolstate("rustc-guide", toolstate);
}
}