From 184d3bca6cc1ac2023bbd723223d1a9bd4d4380b Mon Sep 17 00:00:00 2001 From: Mark Simulacrum Date: Sun, 1 Apr 2018 10:51:24 -0600 Subject: [PATCH] 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. --- src/bootstrap/lib.rs | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index c76b6180749..2eeb2691eae 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -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::>(), - act_graph.raw_nodes().iter().map(|i| &i.weight).collect::>()); - assert_eq!(dry_graph.raw_edges() - .iter().map(|i| (&dry_graph[i.source()], &dry_graph[i.target()], &i.weight)) - .collect::>(), - act_graph.raw_edges() - .iter().map(|i| (&act_graph[i.source()], &act_graph[i.target()], &i.weight)) - .collect::>()); + builder.execute_cli(); } else { let builder = builder::Builder::new(&self); let _ = builder.execute_cli();