diff options
| author |  ulfjack <ulfjack@google.com> | 2018-07-23 01:19:20 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-23 01:20:29 -0700 |
| commit | f000996d0c12c1e239cce200c2792f226adcb89b (patch) | |
| tree | 22f55535a9ad659ef48f6e8bedb1d2680a21b989 /src/main/java/com/google/devtools/build/lib/analysis | |
| parent | 17b217c0110e9bbc2145de563ab0d599c6339890 (diff) | |
Fix TargetCompleteEvent.referencedLocalFiles
It was missing the baseline coverage files, if any.
This is safe even if unknown commit is rolled back.
PiperOrigin-RevId: 205626149
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java | 5 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java index 2f09dbbf03..8f0fe1a577 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java @@ -18,7 +18,6 @@ import static com.google.devtools.build.lib.syntax.EvalUtils.SKYLARK_COMPARATOR; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Sets; import com.google.devtools.build.lib.actions.Artifact; @@ -118,8 +117,8 @@ public final class OutputGroupInfo extends NativeInfo /** * The default set of OutputGroups we typically want to build. */ - public static final ImmutableSet<String> DEFAULT_GROUPS = - ImmutableSet.of(DEFAULT, TEMP_FILES, HIDDEN_TOP_LEVEL); + public static final ImmutableSortedSet<String> DEFAULT_GROUPS = + ImmutableSortedSet.of(DEFAULT, TEMP_FILES, HIDDEN_TOP_LEVEL); private final ImmutableMap<String, NestedSet<Artifact>> outputGroups; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java b/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java index 767eac0bb4..53a3f16e7e 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/TargetCompleteEvent.java @@ -293,6 +293,14 @@ public final class TargetCompleteEvent } } } + if (baselineCoverageArtifacts != null) { + for (Artifact artifact : baselineCoverageArtifacts) { + builder.add( + new LocalFile( + artifact.getPath(), + artifact.isSourceArtifact() ? LocalFileType.SOURCE : LocalFileType.OUTPUT)); + } + } return builder.build(); } |