From fcd6d8d77b30d84bcbe84669126d8ab9d9713870 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Wed, 15 Nov 2017 10:02:59 +0100 Subject: [PATCH] Bug 1416743 - Pass '--llvm' argument to grcov on Windows. r=jmaher The Windows code coverage build is using LLVM, so we need to tell grcov that the artifacts are in the LLVM format. --HG-- extra : rebase_source : 8507ce4e3614b24275350e48a761fd8a129e0e39 --- testing/mozharness/mozharness/mozilla/testing/codecoverage.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testing/mozharness/mozharness/mozilla/testing/codecoverage.py b/testing/mozharness/mozharness/mozilla/testing/codecoverage.py index a5b82eb62547..4e7e0b6c3230 100644 --- a/testing/mozharness/mozharness/mozilla/testing/codecoverage.py +++ b/testing/mozharness/mozharness/mozilla/testing/codecoverage.py @@ -180,6 +180,9 @@ class CodeCoverageMixin(object): os.path.join(self.grcov_dir, 'target.code-coverage-gcno.zip'), file_path_gcda ] + if mozinfo.os == 'win': + grcov_command += ['--llvm'] + # '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(