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

jenkins: fix coverage gcovr patches #1145

Closed
wants to merge 2 commits into from
Closed

jenkins: fix coverage gcovr patches #1145

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03b3568
jenkins: fix coverage gcovr patches
killagu Feb 22, 2018
d70000d
remove-exists-code
Feb 25, 2018
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
22 changes: 6 additions & 16 deletions jenkins/scripts/coverage/gcovr-patches.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,13 @@
diff --git a/scripts/gcovr b/scripts/gcovr
index 034779c86d29..e68b239c424f 100755
--- a/scripts/gcovr
+++ b/scripts/gcovr
@@ -496,7 +496,7 @@ def process_gcov_data(data_fname, covdata, options):
diff --git a/gcovr/gcov.py b/gcovr/gcov.py
index f30215a..7fb0db2 100644
--- a/gcovr/gcov.py
+++ b/gcovr/gcov.py
@@ -156,7 +156,7 @@ def process_gcov_data(data_fname, covdata, source_fname, options):
if filtered_fname is None:
if options.verbose:
sys.stdout.write(" Filtering coverage data for file %s\n" % fname)
- return
+ #return
+ # return
#
# Return if the filename matches the exclude pattern
#
@@ -2141,6 +2141,9 @@ if options.objdir:
for i in range(0, len(options.exclude)):
options.exclude[i] = re.compile(options.exclude[i])

+if options.output is not None:
+ options.output = os.path.abspath(options.output)
+
if options.root is not None:
if not options.root:
sys.stderr.write(