squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

don't fail manifest creation if the toolstate file is missing or mal-formed

Browse source
This commit is contained in:
Ralf Jung 2019-11-03 11:55:05 +01:00
parent 9138d3bb80
commit a675fd6f2e
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/tools/build-manifest/src/main.rs
View file

@ -4,6 +4,7 @@
//! via `x.py dist hash-and-sign`; the cmdline arguments are set up
//! by rustbuild (in `src/bootstrap/dist.rs`).
#![feature(try_blocks)]
#![deny(warnings)]
use toml;
@ -380,11 +381,14 @@ impl Builder {
/// If a tool does not pass its tests, don't ship it.
/// Right now, we do this only for Miri.
fn check_toolstate(&mut self) {
// Get the toolstate for this rust revision.
let toolstates = File::open(self.input.join("toolstates-linux.json"))
.expect("failed to open toolstates file");
let toolstates: HashMap<String, String> = serde_json::from_reader(&toolstates)
.expect("toolstates file contains malformed JSON");
let toolstates: Option<HashMap<String, String>> = try {
let toolstates = File::open(self.input.join("toolstates-linux.json")).ok()?;
serde_json::from_reader(&toolstates).ok()?
};
let toolstates = toolstates.unwrap_or_else(|| {
println!("WARNING: `toolstates-linux.json` missing; assuming all tools failed");
HashMap::default() // Use empty map if anything went wrong.
});
// Mark some tools as missing based on toolstate.
if toolstates.get("miri").map(|s| &*s as &str) != Some("test-pass") {
println!("Miri tests are not passing, removing component");