Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#6764] Fix coverage display when running tests #6766

Merged
merged 1 commit into from
Sep 17, 2024
Merged

[#6764] Fix coverage display when running tests #6766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions base/src/com/google/idea/blaze/base/command/info/BlazeInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,15 @@ public static BlazeInfo create(
ExecutionRootPath.createAncestorRelativePath(
executionRoot, new File(getOrThrow(blazeInfoMap, blazeTestlogsKey(buildSystemName))));
File outputBase = new File(getOrThrow(blazeInfoMap, OUTPUT_BASE_KEY).trim());
File outputPath = new File(getOrThrow(blazeInfoMap, OUTPUT_PATH_KEY).trim());
return AutoValue_BlazeInfo.builder()
.setBlazeInfoMap(blazeInfoMap)
.setExecutionRoot(executionRoot)
.setBlazeBin(blazeBin)
.setBlazeGenfiles(blazeGenfiles)
.setBlazeTestlogs(blazeTestlogs)
.setOutputBase(outputBase)
.setOutputPath(outputPath)
.autoBuild();
}

Expand Down Expand Up @@ -140,6 +142,8 @@ public File getBlazeTestlogsDirectory() {

public abstract File getOutputBase();

public abstract File getOutputPath();

public String getStarlarkSemantics() {
return getBlazeInfoMap().get(STARLARK_SEMANTICS);
}
Expand All @@ -160,6 +164,7 @@ public static BlazeInfo createMockBlazeInfo(
ImmutableMap.Builder<String, String> blazeInfoMap =
ImmutableMap.<String, String>builder()
.put(OUTPUT_BASE_KEY, outputBase)
.put(OUTPUT_PATH_KEY, outputBase + "/output")
.put(EXECUTION_ROOT_KEY, executionRoot)
.put(blazeBinKey(buildSystemName), blazeBin)
.put(blazeGenfilesKey(buildSystemName), blazeGenFiles)
Expand All @@ -181,12 +186,15 @@ public abstract static class Builder {

public abstract Builder setOutputBase(File value);

public abstract Builder setOutputPath(File value);

public abstract BlazeInfo autoBuild();

// A build method to populate the blazeInfoMap
public BlazeInfo build(BuildSystemName buildSystemName) {
BlazeInfo blazeInfo = autoBuild();
blazeInfoMapBuilder().put(OUTPUT_BASE_KEY, blazeInfo.getOutputBase().getPath());
blazeInfoMapBuilder().put(OUTPUT_PATH_KEY, blazeInfo.getOutputPath().getPath());
blazeInfoMapBuilder().put(EXECUTION_ROOT_KEY, blazeInfo.getExecutionRoot().getPath());
File execRoot = new File(blazeInfo.getExecutionRoot().getAbsolutePath());
blazeInfoMapBuilder()
Expand Down
2 changes: 1 addition & 1 deletion base/src/com/google/idea/blaze/base/run/coverage/CoverageUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public static ImmutableList<String> getBlazeFlags() {
}

public static File getOutputFile(BlazeInfo blazeInfo) {
File coverageRoot = new File(blazeInfo.getOutputBase(), "_coverage");
File coverageRoot = new File(blazeInfo.getOutputPath(), "_coverage");
return new File(coverageRoot, "_coverage_report.dat");
}
}
4 changes: 3 additions & 1 deletion ...tegrationtests/com/google/idea/blaze/java/fastbuild/FastBuildChangedFilesServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ public class FastBuildChangedFilesServiceTest extends BlazeIntegrationTestCase {
"blaze-genfiles", BLAZE_EXECROOT + "/blaze-genfiles",
"blaze-testlogs", BLAZE_TESTLOGS,
"execution_root", BLAZE_EXECROOT,
"output_base", "/blaze/output-base"));
"output_base", "/blaze/output-base",
"output_path", "/blaze/output-base/output-path"
));

private FastBuildChangedFilesService changedFilesService;
private ArtifactLocationDecoder artifactLocationDecoder;
Expand Down
Loading