From de3e9d5c1feec29149bac6ac0e1d9f3c65e00332 Mon Sep 17 00:00:00 2001 From: Ulf Adams Date: Wed, 10 Feb 2016 12:07:44 +0000 Subject: 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 --- .../google/devtools/build/lib/pkgcache/LegacyLoadingPhaseRunner.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build/lib/pkgcache/LegacyLoadingPhaseRunner.java') diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/LegacyLoadingPhaseRunner.java b/src/main/java/com/google/devtools/build/lib/pkgcache/LegacyLoadingPhaseRunner.java index 9b6b6841b3..7fda021118 100644 --- a/src/main/java/com/google/devtools/build/lib/pkgcache/LegacyLoadingPhaseRunner.java +++ b/src/main/java/com/google/devtools/build/lib/pkgcache/LegacyLoadingPhaseRunner.java @@ -281,7 +281,8 @@ public final class LegacyLoadingPhaseRunner extends LoadingPhaseRunner { private void postLoadingLogging(EventBus eventBus, ImmutableSet originalTargetsToLoad, ImmutableSet expandedTargetsToLoad, Stopwatch timer) { Set testSuiteTargets = Sets.difference(originalTargetsToLoad, expandedTargetsToLoad); - eventBus.post(new LoadingPhaseCompleteEvent(expandedTargetsToLoad, testSuiteTargets, + eventBus.post(new LoadingPhaseCompleteEvent( + expandedTargetsToLoad, ImmutableSet.copyOf(testSuiteTargets), packageManager.getStatistics(), timer.stop().elapsed(TimeUnit.MILLISECONDS))); LOG.info("Loading phase finished"); } -- cgit v1.2.3