diff options
author | Klaus Aehlig <aehlig@google.com> | 2017-03-01 17:12:09 +0000 |
---|---|---|
committer | Yue Gan <yueg@google.com> | 2017-03-01 17:21:29 +0000 |
commit | 105db844833c016550817662791e5c04efb91445 (patch) | |
tree | 1c936fc141a2db3f7772d2f5db7cb10fa770a3bb /src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java | |
parent | 5bd448c47e2714be229154d42157c7390e4583a1 (diff) |
BEP: Report pattern expansion failures
If expanding a pattern fails, report this on the build event protocol;
also include details of what happened.
--
Change-Id: I2bc9caf7c085911b80551d7892cc34f5e9961c7b
Reviewed-on: https://cr.bazel.build/8795
PiperOrigin-RevId: 148894326
MOS_MIGRATED_REVID=148894326
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java index 6fc79ef7e0..af3450e765 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeTargetPatternEvaluator.java @@ -121,8 +121,13 @@ final class SkyframeTargetPatternEvaluator implements TargetPatternEvaluator { } } ImmutableList<SkyKey> skyKeys = builder.build(); - return parseTargetPatternKeys(skyKeys, SkyframeExecutor.DEFAULT_THREAD_COUNT, keepGoing, - eventHandler, createTargetPatternEvaluatorUtil(policy, eventHandler, keepGoing)); + return parseTargetPatternKeys( + targetPatterns, + skyKeys, + SkyframeExecutor.DEFAULT_THREAD_COUNT, + keepGoing, + eventHandler, + createTargetPatternEvaluatorUtil(policy, eventHandler, keepGoing)); } private TargetPatternsResultBuilder createTargetPatternEvaluatorUtil( @@ -134,6 +139,7 @@ final class SkyframeTargetPatternEvaluator implements TargetPatternEvaluator { } ResolvedTargets<Target> parseTargetPatternKeys( + List<String> targetPattern, Iterable<SkyKey> patternSkyKeys, int numThreads, boolean keepGoing, @@ -178,6 +184,7 @@ final class SkyframeTargetPatternEvaluator implements TargetPatternEvaluator { } if (keepGoing) { eventHandler.handle(Event.error("Skipping '" + rawPattern + "': " + errorMessage)); + eventHandler.post(PatternExpandingError.skipped(rawPattern, errorMessage)); } finalTargetSetEvaluator.setError(); @@ -192,6 +199,7 @@ final class SkyframeTargetPatternEvaluator implements TargetPatternEvaluator { Preconditions.checkState(errorMessage != null, "unexpected errors: %s", result.errorMap()); finalTargetSetEvaluator.setError(); if (!keepGoing) { + eventHandler.post(PatternExpandingError.failed(targetPattern, errorMessage)); throw new TargetParsingException(errorMessage); } } |