Fix SkyframeLoadingPhaseRunner posting of EventBus events.

The TargetParsingCompleteEvent was posting the post-expansion targets, and the
LoadingPhaseCompleteEvent was missing the test-suite targets.

--
MOS_MIGRATED_REVID=114312273

1 files changed, 6 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseFunction.java
index ea30c0584c..9608878f34 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseFunction.java
@@ -159,9 +159,12 @@ final class TargetPatternPhaseFunction implements SkyFunction {
         expandedTargetsBuilder.add(target);
       }
     }
-    targets = expandedTargetsBuilder.build();
-    return new TargetPatternPhaseValue(targets.getTargets(), testsToRun, preExpansionError,
-        targets.hasError(), filteredTargets, testFilteredTargets);
+    ResolvedTargets<Target> expandedTargets = expandedTargetsBuilder.build();
+    Set<Target> testSuiteTargets =
+        Sets.difference(targets.getTargets(), expandedTargets.getTargets());
+    return new TargetPatternPhaseValue(expandedTargets.getTargets(), testsToRun, preExpansionError,
+        expandedTargets.hasError(), filteredTargets, testFilteredTargets,
+        targets.getTargets(), ImmutableSet.copyOf(testSuiteTargets));
   }
 
   /**