From bba75d81fe5c740ca79fbb2c179a30e1ba3f0f74 Mon Sep 17 00:00:00 2001
From: Lukacs Berki <lberki@google.com>
Date: Tue, 14 Jun 2016 09:08:29 +0000
Subject: Report cycles involving aspects correctly.

This involved refactoring BuildViewTestCase a bit so that its behavior is closer to that of Bazel with --experimental_interleave_loading_and_analysis.

RELNOTES:

--
MOS_MIGRATED_REVID=124816624
---
 .../com/google/devtools/build/lib/skyframe/SkyframeExecutor.java   | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java')

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index e33c7e8c8d..63486e66ad 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -1200,6 +1200,13 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
     }
 
     EvaluationResult<SkyValue> result = evaluateSkyKeys(eventHandler, skyKeys);
+    for (Map.Entry<SkyKey, ErrorInfo> entry : result.errorMap().entrySet()) {
+      getCyclesReporter().reportCycles(
+          entry.getValue().getCycleInfo(),
+          entry.getKey(),
+          eventHandler);
+    }
+
     ImmutableMap.Builder<Dependency, ConfiguredTarget> cts = ImmutableMap.builder();
 
   DependentNodeLoop:
-- 
cgit v1.2.3