Make build events correctly report target expansion

In particular, correctly report the expansion of a test
suite even if only requested to build (but not test).

--
Change-Id: Ia25305a4f5ed53118cbb1970a8055d156e8e50be
Reviewed-on: https://cr.bazel.build/7535
PiperOrigin-RevId: 141027655
MOS_MIGRATED_REVID=141027655

1 files changed, 7 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/TargetParsingCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/pkgcache/TargetParsingCompleteEvent.java
index 8e0022a46a..82fbcf1638 100644
--- a/src/main/java/com/google/devtools/build/lib/pkgcache/TargetParsingCompleteEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/pkgcache/TargetParsingCompleteEvent.java
@@ -35,6 +35,7 @@ public class TargetParsingCompleteEvent implements BuildEvent {
   private final ImmutableSet<Target> targets;
   private final ImmutableSet<Target> filteredTargets;
   private final ImmutableSet<Target> testFilteredTargets;
+  private final ImmutableSet<Target> expandedTargets;
   private final long timeInMs;
 
   /**
@@ -47,12 +48,14 @@ public class TargetParsingCompleteEvent implements BuildEvent {
       Collection<Target> filteredTargets,
       Collection<Target> testFilteredTargets,
       long timeInMs,
-      List<String> originalTargetPattern) {
+      List<String> originalTargetPattern,
+      Collection<Target> expandedTargets) {
     this.timeInMs = timeInMs;
     this.targets = ImmutableSet.copyOf(targets);
     this.filteredTargets = ImmutableSet.copyOf(filteredTargets);
     this.testFilteredTargets = ImmutableSet.copyOf(testFilteredTargets);
     this.originalTargetPattern = ImmutableList.copyOf(originalTargetPattern);
+    this.expandedTargets = ImmutableSet.copyOf(expandedTargets);
   }
 
   @VisibleForTesting
@@ -62,7 +65,8 @@ public class TargetParsingCompleteEvent implements BuildEvent {
         ImmutableSet.<Target>of(),
         ImmutableSet.<Target>of(),
         0,
-        ImmutableList.<String>of());
+        ImmutableList.<String>of(),
+        targets);
   }
 
   /**
@@ -107,7 +111,7 @@ public class TargetParsingCompleteEvent implements BuildEvent {
   @Override
   public Collection<BuildEventId> getChildrenEvents() {
     ImmutableList.Builder childrenBuilder = ImmutableList.builder();
-    for (Target target : targets) {
+    for (Target target : expandedTargets) {
       // Test suits won't produce a target-complete event, so do not anounce their
       // completion as children.
       if (!TargetUtils.isTestSuiteRule(target)) {