1374663 - Update GRCOV in tooltool and change how it is used to process code coverage data in linux64-ccov.

Status: RESOLVED FIXED

(Testing :: Code Coverage, defect)

Description

[Greg Mierzwinski [:sparky]]

This bug is for updating the GRCOV version that is on tooltool and changing how grcov is called for code coverage processing in the codecoverage.py file for linux64-ccov.

Comment 1

[Marco Castelluccio [:marco]]

I've uploaded the new grcov version.

Comment 2

[Marco Castelluccio [:marco]]

I've uploaded a new one (v0.1.12) that also fixes https://github.com/marco-c/grcov/issues/32.

Comment 3

[Marco Castelluccio [:marco]]

Greg, it was hard, but I think I managed to find what was the problem with https://hg.mozilla.org/try/rev/e2a2b9cb8686f9f9b806b63a630300e021f72581.

Look at the `-p` argument before and after:
-            grcov_command = [os.path.join(self.grcov_dir, 'grcov'), '-t', 'lcov' , '-p', \
-                             '/home/worker/workspace/build/src/', '-z', \
-                             os.path.join(self.grcov_dir, 'target.code-coverage-gcno.zip'), file_path_gcda]
+            grcov_command = [os.path.join(self.grcov_dir, 'grcov'), \
+                             os.path.join(self.grcov_dir, 'target.code-coverage-gcno.zip'), self.gcov_dir, \
+                             '-t', 'lcov' , '-p', 'home/worker/workspace/build/src/', '--keep-global-includes']

In the second case, there's a "/" missing at the beginning, which makes it a relative path instead of an absolute one :)

(I think you can also re-remove "--keep-global-includes" now)

Comment 4

[Greg Mierzwinski [:sparky]]

Thanks for catching that Marco! Sorry for the trouble.

Comment 5

[Greg Mierzwinski [:sparky]]

Attachment: Bug 1374663 - Update used GRCOV version and change its usage.

This patch upgrades the GRCOV version being used and changes how it is used in 'codecoverage.py'.

Review commit: https://reviewboard.mozilla.org/r/153752/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/153752/

Comment 6

[Marco Castelluccio [:marco]]

Comment on attachment 8882681 [details]
Bug 1374663 - Update used GRCOV version and change its usage.

https://reviewboard.mozilla.org/r/153752/#review158934

::: commit-message-217b7:1
(Diff revision 1)
> +Bug 1374663 - Update used GRCOV version and change it's usage. r?marco

Typo "its" instead of "it's"

::: testing/mozharness/mozharness/mozilla/testing/codecoverage.py:135
(Diff revision 1)
>              self.download_file(self.url_to_gcno, file_name=None, parent_dir=self.grcov_dir)
>  
>              # Run grcov on the zipped .gcno and .gcda files.
> -            grcov_command = [os.path.join(self.grcov_dir, 'grcov'), '-t', 'lcov' , '-p', \
> -                             '/home/worker/workspace/build/src/', '-z', \
> -                             os.path.join(self.grcov_dir, 'target.code-coverage-gcno.zip'), file_path_gcda]
> +            grcov_command = [os.path.join(self.grcov_dir, 'grcov'), \
> +                             os.path.join(self.grcov_dir, 'target.code-coverage-gcno.zip'), file_path_gcda, \
> +                             '-t', 'lcov' , '-p', '/home/worker/workspace/build/src/']

Nit: if you keep the same order as before and only remove the `-z` parameter, there will be less changes.

Comment 7

[Greg Mierzwinski [:sparky]]

Comment on attachment 8882681 [details]
Bug 1374663 - Update used GRCOV version and change its usage.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/153752/diff/1-2/

Comment 8

[Greg Mierzwinski [:sparky]]

:marco, could you land this for us?

Comment 9

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/63be9b006e21
Update used GRCOV version and change its usage. r=marco

Comment 10

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/63be9b006e21