diff options
| author |  mjhalupka <mjhalupka@google.com> | 2018-02-10 08:34:41 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-10 08:36:32 -0800 |
| commit | d707135d5381a230218e3050a7d1b23e37911020 (patch) | |
| tree | b2c3aaa9e4012950818a3c8b9d510915e02d22a7 /src/main/java/com/google/devtools/build/lib | |
| parent | c3c5d9bc0e52362bf37129099ba3af1b06229501 (diff) | |
Rollback changes to TargetCompleteEvent
PiperOrigin-RevId: 185255326
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java index 607984dc75..ecad21968d 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java @@ -43,6 +43,7 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.NestedSetView; import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.packages.AttributeMap; +import com.google.devtools.build.lib.packages.TestSize; import com.google.devtools.build.lib.rules.AliasConfiguredTarget; import com.google.devtools.build.lib.syntax.Type; import com.google.devtools.build.skyframe.SkyValue; @@ -154,7 +155,7 @@ public final class TargetCompleteEvent // For tests, announce all the test actions that will minimally happen (except for // interruption). If after the result of a test action another attempt is necessary, // it will be announced with the action that made the new attempt necessary. - Label label = target.getLabel(); + Label label = target.getTarget().getLabel(); TestProvider.TestParams params = target.getProvider(TestProvider.class).getTestParams(); for (int run = 0; run < Math.max(params.getRuns(), 1); run++) { for (int shard = 0; shard < Math.max(params.getShards(), 1); shard++) { @@ -186,9 +187,16 @@ public final class TargetCompleteEvent BuildEventStreamProtos.TargetComplete.newBuilder(); builder.setSuccess(!failed()); + builder.setTargetKind(target.getTarget().getTargetKind()); builder.addAllTag(getTags()); builder.addAllOutputGroup(getOutputFilesByGroup(converters.artifactGroupNamer())); + if (isTest) { + builder.setTestSize( + TargetConfiguredEvent.bepTestSize( + TestSize.getTestSize(target.getTarget().getAssociatedRule()))); + } + // TODO(aehlig): remove direct reporting of artifacts as soon as clients no longer // need it. for (ArtifactsInOutputGroup group : outputs) { |