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

Updated profdata_coverage_dir to work with Xcode 7.3 #169

Merged
merged 2 commits into from
Mar 22, 2016
Merged

Updated profdata_coverage_dir to work with Xcode 7.3 #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ead9533
Updated profdata_coverage_dir to work with Xcode 7.3.
ksuther Mar 21, 2016
b3618d8
Updated change log for #169.
ksuther Mar 22, 2016
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# CHANGELOG

## master
* Xcode 7.3 compatibility (updated path returned by `profdata_coverage_dir`)
[Kent Sutherland](https://github.com/ksuther)
[#125](https://github.com/SlatherOrg/slather/issues/125), [#169](https://github.com/SlatherOrg/slather/pull/169)

* Improve matching of xctest bundles when using `--binary-basename`
[Kent Sutherland](https://github.com/ksuther)
[#167](https://github.com/SlatherOrg/slather/pull/167)
Expand Down
5 changes: 5 additions & 0 deletions lib/slather/project.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,11 @@ def profdata_coverage_dir
dir = Dir[File.join("#{build_directory}","/**/#{first_product_name}")].first
end

if dir == nil
# Xcode 7.3 moved the location of Coverage.profdata
dir = Dir[File.join("#{build_directory}","/**/CodeCoverage")].first
end

raise StandardError, "No coverage directory found. Are you sure your project is setup for generating coverage files? Try `slather setup your/project.xcodeproj`" unless dir != nil
dir
end
Expand Down