diff options
author | 2015-02-18 13:16:53 +0000 | |
---|---|---|
committer | 2015-02-18 13:16:53 +0000 | |
commit | c340a07636f485253f8415f15e88f4b39739aab8 (patch) | |
tree | 70c96a0f859f3564c465440582b65f20c97d8ddf /src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java | |
parent | 26ebf3d2edb1bb2d8ad55da5dc47e23e1db817cf (diff) |
Fix fallout from [] by introducing a distinction between "important" and "not important" artifacts to build.
I erroneously believed that only filesToBuild is built, whereas it's actually filesToBuild + the default runfiles + some coverage artifacts.
I have no idea why we need to build the default runfiles. Maybe a better plan is to ditch this distinction and instead just not build those and display the baseline coverage artifacts, but I have no idea what would break then.
--
MOS_MIGRATED_REVID=86583095
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java index 51828a06a1..7882751115 100644 --- a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java +++ b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java @@ -369,9 +369,11 @@ public class ExecutionTool { Set<ConfiguredTarget> builtTargets = new HashSet<>(); boolean interrupted = false; try { - Iterable<Artifact> allArtifactsForProviders = Iterables.concat(additionalArtifacts, + Iterable<Artifact> allArtifactsForProviders = Iterables.concat( + additionalArtifacts, TopLevelArtifactHelper.getAllArtifactsToBuild( - analysisResult.getTargetsToBuild(), analysisResult.getTopLevelContext()), + analysisResult.getTargetsToBuild(), analysisResult.getTopLevelContext()) + .getAllArtifacts(), TopLevelArtifactHelper.getAllArtifactsToTest(analysisResult.getTargetsToTest())); if (request.isRunningInEmacs()) { // The syntax of this message is tightly constrained by lisp/progmodes/compile.el in emacs @@ -675,7 +677,8 @@ public class ExecutionTool { // For up-to-date targets report generated artifacts, but only // if they have associated action and not middleman artifacts. boolean headerFlag = true; - for (Artifact artifact : TopLevelArtifactHelper.getAllArtifactsToBuild(target, context)) { + for (Artifact artifact : + TopLevelArtifactHelper.getAllArtifactsToBuild(target, context).getImportantArtifacts()) { if (!artifact.isSourceArtifact() && !artifact.isMiddlemanArtifact()) { if (headerFlag) { outErr.printErr("Target " + label + " up-to-date:\n"); |