Bug 1623299 - Update grcov to 0.5.14 r=marco

Update grcov and replace use of '--ignore-dir' by '--ignore'

Differential Revision: https://phabricator.services.mozilla.com/D74819
This commit is contained in:
Calixte Denizet 2020-05-12 09:19:49 +00:00
parent 2f778385e8
commit d26662bb72
3 changed files with 8 additions and 8 deletions

View File

@ -230,9 +230,9 @@ grcov-osx-x86_64:
description: grcov binary release
fetch:
type: static-url
url: https://github.com/mozilla/grcov/releases/download/v0.5.3/grcov-osx-x86_64.tar.bz2
sha256: 93db5da4118951d459200a352eb1e3610296a3ee5c51839ab8400a9d968ffb5f
size: 1251321
url: https://github.com/mozilla/grcov/releases/download/v0.5.14/grcov-osx-x86_64.tar.bz2
sha256: 17692a7ee09fbd49cac1194500c9c9e2bc76a23cd702f88026955f25fe7548a8
size: 1213868
zlib-1.2.11:
description: zlib 1.2.11 source code
@ -342,8 +342,8 @@ grcov:
description: grcov source code
fetch:
type: git
repo: https://github.com/marco-c/grcov
revision: cc1b62ceb8007af08940d535cd396ed0f95ef769
repo: https://github.com/mozilla/grcov
revision: 51300e533abc21231881259290da7692c279c0d6
sccache:
description: sccache source code

View File

@ -297,8 +297,8 @@ class CodeCoverageMixin(SingleTestMixin):
os.path.join(self.grcov_dir, self.grcov_bin),
'-t', output_format,
'-p', self.prefix,
'--ignore-dir', 'gcc*',
'--ignore-dir', 'vs2017_*',
'--ignore', 'gcc*',
'--ignore', 'vs2017_*',
os.path.join(self.grcov_dir, 'target.code-coverage-gcno.zip'), gcov_dir
]

View File

@ -50,7 +50,7 @@ def main():
assert os.path.isdir(ignore_dir_abs), '{} is not a directory'.format(ignore_dir_abs)
assert ignore_dir_abs.startswith(buildconfig.topsrcdir), '{} should start with {}'.format(ignore_dir_abs, buildconfig.topsrcdir)
grcov_command += ['--ignore-dir', os.path.relpath(ignore_dir_abs, buildconfig.topsrcdir) + '*']
grcov_command += ['--ignore', os.path.relpath(ignore_dir_abs, buildconfig.topsrcdir) + '*']
if buildconfig.substs['OS_TARGET'] == 'Linux':
gcc_dir = os.path.join(os.environ['MOZ_FETCHES_DIR'], 'gcc')