diff options
| author |  tomlu <tomlu@google.com> | 2018-04-03 10:01:10 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-03 10:02:35 -0700 |
| commit | 6ed4fd55ac792b4b6a5003cb1530a5a8b1b8b55d (patch) | |
| tree | 6f05fd4b3c4be367b25980a06998beb8cb8605de /src/test/java/com/google/devtools/build/lib/skyframe | |
| parent | 87cd8d6dc4180692fa6d773683fea7a9d02107f1 (diff) | |
Fix build results for aspect builds.
The current output was pretty much completely incorrect. However since the result output was always hidden for the default value of --show_result, users simply didn't see the incorrect output (instead getting no output at all).
This CL fixes both the --show_result problem and makes the output correct.
RELNOTES: Print correct build result for builds with --aspects flag.
PiperOrigin-RevId: 191456352
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/skyframe')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java | 3 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java index 0a83696c54..5332637254 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/SkyframeAwareActionTest.java @@ -407,6 +407,7 @@ public class SkyframeAwareActionTest extends TimestampBuilderTestCase { null, executor, null, + null, false, null, null); @@ -436,6 +437,7 @@ public class SkyframeAwareActionTest extends TimestampBuilderTestCase { null, executor, null, + null, false, null, null); @@ -816,6 +818,7 @@ public class SkyframeAwareActionTest extends TimestampBuilderTestCase { null, executor, null, + null, false, null, null); diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java index 94ab81df76..b327612ad6 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/TimestampBuilderTestCase.java @@ -64,6 +64,7 @@ import com.google.devtools.build.lib.events.Reporter; import com.google.devtools.build.lib.events.StoredEventHandler; import com.google.devtools.build.lib.exec.SingleBuildFileCache; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; +import com.google.devtools.build.lib.skyframe.AspectValue.AspectKey; import com.google.devtools.build.lib.skyframe.ExternalFilesHelper.ExternalFileAction; import com.google.devtools.build.lib.skyframe.PackageLookupFunction.CrossRepositoryLabelViolationStrategy; import com.google.devtools.build.lib.skyframe.SkyframeActionExecutor.ActionCompletedReceiver; @@ -259,6 +260,7 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase { Collection<AspectValue> aspects, Executor executor, Set<ConfiguredTarget> builtTargets, + Set<AspectKey> builtAspects, boolean explain, Range<Long> lastExecutionTimeRange, TopLevelArtifactContext topLevelArtifactContext) @@ -400,7 +402,8 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase { tsgm.setCommandStartTime(); Set<Artifact> artifactsToBuild = Sets.newHashSet(artifacts); - Set<ConfiguredTarget> builtArtifacts = new HashSet<>(); + Set<ConfiguredTarget> builtTargets = new HashSet<>(); + Set<AspectKey> builtAspects = new HashSet<>(); try { builder.buildArtifacts( reporter, @@ -411,8 +414,9 @@ public abstract class TimestampBuilderTestCase extends FoundationTestCase { null, null, executor, - builtArtifacts, /*explain=*/ - false, + builtTargets, + builtAspects, + false /*explain*/, null, null); } finally { |