bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Stop checking that the graph produced by a dry run is equivalent

Browse source 
This is too likely to cause spurious bounces on CI; what we run may be
dependent on what ran successfully before hand (e.g. RLS features with
Clippy), which makes this not tenable. There's no good way to ignore
specifically these problematic steps so we'll just ignore everything for
the time being. We still test that a dry run worked though so largely
this is the same from a ensure-that-tests-work perspective.

Eventually we'll want to undo this commit, though, to make our tests
more accurate.
This commit is contained in:
Mark Simulacrum 2018-04-01 10:51:24 -06:00
parent 0ce5cf0697
commit 184d3bca6c
1 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/bootstrap/lib.rs
View file

@ -416,22 +416,14 @@ impl Build {
}
if !self.config.dry_run {
let dry_graph = {
{
self.config.dry_run = true;
let builder = builder::Builder::new(&self);
builder.execute_cli()
};
builder.execute_cli();
}
self.config.dry_run = false;
let builder = builder::Builder::new(&self);
let act_graph = builder.execute_cli();
assert_eq!(dry_graph.raw_nodes().iter().map(|i| &i.weight).collect::<Vec<_>>(),
act_graph.raw_nodes().iter().map(|i| &i.weight).collect::<Vec<_>>());
assert_eq!(dry_graph.raw_edges()
.iter().map(|i| (&dry_graph[i.source()], &dry_graph[i.target()], &i.weight))
.collect::<Vec<_>>(),
act_graph.raw_edges()
.iter().map(|i| (&act_graph[i.source()], &act_graph[i.target()], &i.weight))
.collect::<Vec<_>>());
builder.execute_cli();
} else {
let builder = builder::Builder::new(&self);
let _ = builder.execute_cli();