From 97fab8371651ba4c4b9e5ee91759c2435a135306 Mon Sep 17 00:00:00 2001
From: Dmitrii Golovanov <dmitrii.golovanov@intel.com>
Date: Thu, 26 Oct 2023 07:42:28 +0200
Subject: [PATCH] scripts: coverage: gcovr to ignore negative counters

Apply a workaround for an issue introduced with bc8b7dd
for code coverage collection at qemu_x86 when gcov data
was broken because of optimized out memcpy() in write_u64()
static inline function, so gcovr parser fails with
"gcovr.gcov_parser.NegativeHits: Got negative hit value
in gcov line 'branch  1 taken -1'".

Add gcovr command line option to ignore such errors (since v.6.0):
"--gcov-ignore-parse-errors=negative_hits.warn_once_per_file"

Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>
---
 scripts/pylib/twister/twisterlib/coverage.py | 10 +++++-----
 scripts/requirements-build-test.txt          |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/pylib/twister/twisterlib/coverage.py b/scripts/pylib/twister/twisterlib/coverage.py
index c215ae5bd83868..c1c9065d9ad26e 100644
--- a/scripts/pylib/twister/twisterlib/coverage.py
+++ b/scripts/pylib/twister/twisterlib/coverage.py
@@ -221,11 +221,11 @@ def _generate(self, outdir, coveragelog):
         excludes = Gcovr._interleave_list("-e", self.ignores)
 
         # We want to remove tests/* and tests/ztest/test/* but save tests/ztest
-        cmd = ["gcovr", "-r", self.base_dir, "--gcov-executable",
-               str(self.gcov_tool), "-e", "tests/*"] + excludes + ["--json",
-                                                                   "-o",
-                                                                   coveragefile,
-                                                                   outdir]
+        cmd = ["gcovr", "-r", self.base_dir,
+               "--gcov-ignore-parse-errors=negative_hits.warn_once_per_file",
+               "--gcov-executable", str(self.gcov_tool),
+               "-e", "tests/*"]
+        cmd += excludes + ["--json", "-o", coveragefile, outdir]
         cmd_str = " ".join(cmd)
         logger.debug(f"Running {cmd_str}...")
         subprocess.call(cmd, stdout=coveragelog)
diff --git a/scripts/requirements-build-test.txt b/scripts/requirements-build-test.txt
index 79309a179cdf80..c0f808880fbadc 100644
--- a/scripts/requirements-build-test.txt
+++ b/scripts/requirements-build-test.txt
@@ -10,7 +10,7 @@ colorama
 ply>=3.10
 
 # used for code coverage
-gcovr>=4.2
+gcovr>=6.0
 coverage
 
 # used for west-command testing