Skip to content

Updated lcov to 1.12, Xcode 7 compatibility. #41

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

Merged
merged 1 commit into from
Oct 27, 2015
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: 1 addition & 1 deletion envcov.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
scripts="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source "${scripts}/env.sh"

LCOV_PATH="${scripts}/lcov-1.11/bin"
LCOV_PATH="${scripts}/lcov-1.12/bin"
OBJ_DIR="${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}"

# Fix for the new LLVM-COV that requires gcov to have a -v parameter
Expand Down
File renamed without changes.
7 changes: 3 additions & 4 deletions lcov-1.11/bin/gendesc → lcov-1.12/bin/gendesc
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,12 @@
use strict;
use File::Basename;
use Getopt::Long;
use Cwd qw/abs_path/;


# Constants
our $lcov_version = 'LCOV version 1.11';
our $tool_dir = abs_path(dirname($0));
our $lcov_version = 'LCOV version '.`$tool_dir/get_version.sh --full`;
our $lcov_url = "http://ltp.sourceforge.net/coverage/lcov.php";
our $tool_name = basename($0);

Expand All @@ -67,9 +69,6 @@ our $input_filename;
$SIG{__WARN__} = \&warn_handler;
$SIG{__DIE__} = \&die_handler;

# Prettify version string
$lcov_version =~ s/\$\s*Revision\s*:?\s*(\S+)\s*\$/$1/;

# Parse command line options
if (!GetOptions("output-filename=s" => \$output_filename,
"version" =>\$version,
Expand Down
Loading