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
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 2f09dbb..8f0fe1a 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 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 @@ /** * 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 767eac0..53a3f16 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 @@ } } } + if (baselineCoverageArtifacts != null) { + for (Artifact artifact : baselineCoverageArtifacts) { + builder.add( + new LocalFile( + artifact.getPath(), + artifact.isSourceArtifact() ? LocalFileType.SOURCE : LocalFileType.OUTPUT)); + } + } return builder.build(); }
diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEvent.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEvent.java index cee573c..3342909 100644 --- a/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEvent.java +++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEvent.java
@@ -14,6 +14,7 @@ package com.google.devtools.build.lib.buildeventstream; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.events.ExtendedEventHandler; @@ -72,6 +73,14 @@ public int hashCode() { return Objects.hashCode(path, type); } + + @Override + public String toString() { + return MoreObjects.toStringHelper(LocalFile.class) + .add("path", path) + .add("type", type) + .toString(); + } } /**
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD index b1571ea..e782ac7 100644 --- a/src/test/java/com/google/devtools/build/lib/BUILD +++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -802,6 +802,7 @@ "//src/main/java/com/google/devtools/build/lib:skylarkinterface", "//src/main/java/com/google/devtools/build/lib:util", "//src/main/java/com/google/devtools/build/lib/actions", + "//src/main/java/com/google/devtools/build/lib/buildeventstream", "//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto", "//src/main/java/com/google/devtools/build/lib/causes", "//src/main/java/com/google/devtools/build/lib/collect",
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/TargetCompleteEventTest.java b/src/test/java/com/google/devtools/build/lib/analysis/TargetCompleteEventTest.java new file mode 100644 index 0000000..4d16414 --- /dev/null +++ b/src/test/java/com/google/devtools/build/lib/analysis/TargetCompleteEventTest.java
@@ -0,0 +1,62 @@ +// Copyright 2018 The Bazel Authors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.devtools.build.lib.analysis; + +import static com.google.common.truth.Truth.assertThat; + +import com.google.common.collect.Iterables; +import com.google.devtools.build.lib.analysis.TopLevelArtifactHelper.ArtifactsToBuild; +import com.google.devtools.build.lib.analysis.util.AnalysisTestCase; +import com.google.devtools.build.lib.buildeventstream.BuildEvent; +import com.google.devtools.build.lib.buildeventstream.BuildEvent.LocalFile.LocalFileType; +import com.google.devtools.build.lib.cmdline.RepositoryName; +import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** Tests for {@link TargetCompleteEvent}. */ +@RunWith(JUnit4.class) +public class TargetCompleteEventTest extends AnalysisTestCase { + /** Regression test for b/111653523. */ + @Test + public void testReferencedLocalFilesIncludesBaselineCoverage() throws Exception { + scratch.file("java/a/BUILD", + "java_test(name = 'Example', srcs = ['Example.java'])"); + useConfiguration("--collect_code_coverage"); + AnalysisResult result = update("//java/a:Example"); + ConfiguredTarget ct = Iterables.getOnlyElement(result.getTargetsToBuild()); + TargetAndConfiguration tac = Iterables.getOnlyElement(result.getTopLevelTargetsWithConfigs()); + ConfiguredTargetAndData ctAndData = + new ConfiguredTargetAndData(ct, tac.getTarget(), tac.getConfiguration()); + TopLevelArtifactContext context = + new TopLevelArtifactContext(false, OutputGroupInfo.DEFAULT_GROUPS); + ArtifactsToBuild artifactsToBuild = + TopLevelArtifactHelper.getAllArtifactsToBuild(ct, context); + TargetCompleteEvent event = + TargetCompleteEvent.successfulBuild( + ctAndData, artifactsToBuild.getAllArtifactsByOutputGroup()); + assertThat(event.referencedLocalFiles()) + .contains( + new BuildEvent.LocalFile( + tac + .getConfiguration() + .getTestLogsDirectory(RepositoryName.DEFAULT) + .getRoot() + .asPath() + .getRelative("java/a/Example/baseline_coverage.dat"), + LocalFileType.OUTPUT)); + } +}