Bug 1374663 - Update used GRCOV version and change its usage. r?marco
This patch upgrades the GRCOV version being used and changes how it is used in 'codecoverage.py'.
MozReview-Commit-ID: 6fjUB6sV3gy
--- a/testing/config/tooltool-manifests/linux64/ccov.manifest
+++ b/testing/config/tooltool-manifests/linux64/ccov.manifest
@@ -1,9 +1,9 @@
[
{
- "size": 752315,
- "digest": "8e86d7ebbb11758a385bb2af65b3f6444a5c6a1468c35a77f60d253c82affa007c61dc9b73025f8a146678a3ce1b8d050064bccf5efa33357588db10dac44150",
+ "size": 770785,
+ "digest": "ee03f708a8c6e58d9c2dcc6140a720852c47737051df1781f1745f14f6fb11e472da831d138b06a86ab5507dbf3f8d5dcfc7cfe5f83dd09ea34d9bdd515e52c5",
"algorithm": "sha512",
"filename": "grcov-linux-standalone-x86_64.tar.bz2",
"unpack": false
}
]
\ No newline at end of file
--- a/testing/mozharness/mozharness/mozilla/testing/codecoverage.py
+++ b/testing/mozharness/mozharness/mozilla/testing/codecoverage.py
@@ -125,18 +125,18 @@ class CodeCoverageMixin(object):
command = ['zip', '-r', file_path_jsvm, '.']
self.run_command(command, cwd=self.jsvm_dir)
# GRCOV post-processing
# Download the gcno fom the build machine.
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', \
+ grcov_command = [os.path.join(self.grcov_dir, 'grcov'), '-t', 'lcov', '-p', \
+ '/home/worker/workspace/build/src/', \
os.path.join(self.grcov_dir, 'target.code-coverage-gcno.zip'), file_path_gcda]
# 'grcov_output' will be a tuple, the first variable is the path to the lcov output,
# the other is the path to the standard error output.
grcov_output = self.get_output_from_command(grcov_command, cwd=self.grcov_dir, \
silent=True, tmpfile_base_path=os.path.join(self.grcov_dir, 'grcov_lcov_output'), \
save_tmpfiles=True, return_type='files')
new_output_name = grcov_output[0] + '.info'