Skip to content

Added primitive support for llvm-cov -path-equivalence. #547

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

Draft
grigorye wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Added primitive support for llvm-cov -path-equivalence. #547

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c95cf5
Added primitive support for COVERAGE_PATH_EQUIVALENCE.
grigorye Oct 5, 2023
be06263
Fixed support for sources that are actually recompiled.
grigorye Oct 10, 2023
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
6 changes: 5 additions & 1 deletion lib/slather/coverage_info.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,11 @@ def rate_branches_tested
end

def source_file_pathname_relative_to_repo_root
source_file_pathname.realpath.relative_path_from(Pathname("./").realpath)
test_path=source_file_pathname
if ENV["COVERAGE_PATH_EQUIVALENCE"]
test_path=Pathname("." + "#{source_file_pathname}".delete_prefix(ENV["COVERAGE_PATH_EQUIVALENCE"].delete_suffix(",.")))
Copy link
Copy Markdown
Author

@grigorye grigorye Oct 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This only supports COVERAGE_PATH_EQUIVALENCE=XXX,., i.e. relocation from a given source root (XXX) to the current directory.

end
test_path.realpath.relative_path_from(Pathname("./").realpath)
end

def ignored?
Expand Down
6 changes: 6 additions & 0 deletions lib/slather/project.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,9 @@ def unsafe_llvm_cov_export_output(binary_path)
if self.arch
llvm_cov_args << "--arch" << self.arch
end
if ENV["COVERAGE_PATH_EQUIVALENCE"]
llvm_cov_args << "-path-equivalence=#{ENV["COVERAGE_PATH_EQUIVALENCE"]}"
end
`xcrun llvm-cov #{llvm_cov_args.shelljoin}`
end
private :unsafe_llvm_cov_export_output
Expand All @@ -293,6 +296,9 @@ def unsafe_profdata_llvm_cov_output(binary_path, source_files)
if self.arch
llvm_cov_args << "--arch" << self.arch
end
if ENV["COVERAGE_PATH_EQUIVALENCE"]
llvm_cov_args << "-path-equivalence=#{ENV["COVERAGE_PATH_EQUIVALENCE"]}"
end

# POSIX systems have an ARG_MAX for the maximum total length of the command line, so the command may fail with an error message of "Argument list too long".
# Using the xargs command we can break the list of source_files into sublists small enough to be acceptable.
Expand Down