diff options
| author |  Lukacs Berki <lberki@google.com> | 2016-06-14 09:08:29 +0000 |
|---|---|---|
| committer |  Yue Gan <yueg@google.com> | 2016-06-14 11:03:14 +0000 |
| commit | bba75d81fe5c740ca79fbb2c179a30e1ba3f0f74 (patch) | |
| tree | fa8a575020f7d89baf95737f7bc4d75dfa7c079e /src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java | |
| parent | 2571982bbfdda44b176628e3354527970cb61407 (diff) | |
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
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java | 7 |
1 files changed, 7 insertions, 0 deletions
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: |