Skip to content

Commit 184d3bc

Browse files
Stop checking that the graph produced by a dry run is equivalent
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.
1 parent 0ce5cf0 commit 184d3bc

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

src/bootstrap/lib.rs

+4-12
Original file line numberDiff line numberDiff line change
@@ -416,22 +416,14 @@ impl Build {
416416
}
417417

418418
if !self.config.dry_run {
419-
let dry_graph = {
419+
{
420420
self.config.dry_run = true;
421421
let builder = builder::Builder::new(&self);
422-
builder.execute_cli()
423-
};
422+
builder.execute_cli();
423+
}
424424
self.config.dry_run = false;
425425
let builder = builder::Builder::new(&self);
426-
let act_graph = builder.execute_cli();
427-
assert_eq!(dry_graph.raw_nodes().iter().map(|i| &i.weight).collect::<Vec<_>>(),
428-
act_graph.raw_nodes().iter().map(|i| &i.weight).collect::<Vec<_>>());
429-
assert_eq!(dry_graph.raw_edges()
430-
.iter().map(|i| (&dry_graph[i.source()], &dry_graph[i.target()], &i.weight))
431-
.collect::<Vec<_>>(),
432-
act_graph.raw_edges()
433-
.iter().map(|i| (&act_graph[i.source()], &act_graph[i.target()], &i.weight))
434-
.collect::<Vec<_>>());
426+
builder.execute_cli();
435427
} else {
436428
let builder = builder::Builder::new(&self);
437429
let _ = builder.execute_cli();

0 commit comments

Comments
 (0)