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.

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

Add logs to lcov #685

Merged
merged 3 commits into from
Jun 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions server/src/KleeRunner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ void KleeRunner::runKlee(const std::vector<tests::TestMethod> &testMethods,
projectContext.getTestDirAbsPath(),
std::move(prepareTests),
std::move(prepareTotal));

fs::remove_all(kleeOutDir);
}

static void processMethod(MethodKtests &ktestChunk,
Expand Down
9 changes: 7 additions & 2 deletions server/src/coverage/LlvmCoverageTool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ LlvmCoverageTool::getCoverageCommands(const std::vector<UnitTest> &testsToLaunch
mergeArguments.emplace_back("-o");
mergeArguments.emplace_back(mainProfdataPath);
auto mergeTask = ShellExecTask::getShellCommandTask(Paths::getLLVMprofdata(), mergeArguments);

LOG_S(MAX) << "Merge coverage info command: " << mergeTask.toString();

fs::path coverageJsonPath = Paths::getCoverageJsonPath(projectContext);
fs::create_directories(coverageJsonPath.parent_path());
std::vector<std::string> exportArguments = { "export" };
Expand All @@ -112,8 +115,7 @@ LlvmCoverageTool::getCoverageCommands(const std::vector<UnitTest> &testsToLaunch
for (const std::string &objectFile : objectFiles) {
if (firstBIN) {
firstBIN = false;
}
else {
} else {
exportArguments.emplace_back("-object");
}
exportArguments.emplace_back(objectFile);
Expand Down Expand Up @@ -148,6 +150,9 @@ LlvmCoverageTool::getCoverageCommands(const std::vector<UnitTest> &testsToLaunch
auto exportTask = ShellExecTask::getShellCommandTask(Paths::getLLVMcov(), exportArguments);
exportTask.setLogFilePath(coverageJsonPath);
exportTask.setRetainOutputFile(true);

LOG_S(MAX) << "Export coverage command: " << exportTask.toString();

return { mergeTask, exportTask };
}

Expand Down
Loading