commit ae5c14ca942997d04f46cf076660ad9071c76839
author Klaus Aehlig <aehlig@google.com> Tue May 09 08:27:38 2017 -0400
committer Kristina Chodorow <kchodorow@google.com> Tue May 09 10:54:57 2017 -0400
tree eb6d1c5dc592d05176c40e347b4626a3a6d17f2b
parent f49f2be40936666f91eff452187be8d8e2ae7dcf

BEP: Also report the configuration in test

In multi-configuration builds, test can be run for different configurations as well. So
we have to report the configuration for each test as well.

Change-Id: I939cce7464823fbcd3c7161a50b41b94bbed8812
PiperOrigin-RevId: 155493397

src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java

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 f28713f..1e167a3 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
@@ -133,10 +133,11 @@
       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++) {
-          childrenBuilder.add(BuildEventId.testResult(label, run, shard));
+          childrenBuilder.add(
+              BuildEventId.testResult(label, run, shard, target.getConfiguration().getEventId()));
         }
       }
-      childrenBuilder.add(BuildEventId.testSummary(label));
+      childrenBuilder.add(BuildEventId.testSummary(label, target.getConfiguration().getEventId()));
     }
     return childrenBuilder.build();
   }