commit 40d5c7ce5a3d94614a7e5ac437ae274ee8cbbacd
author William A. Kennington III <wak@google.com> Thu Dec 13 14:37:59 2018 -0800
committer William A. Kennington III <wak@google.com> Thu Jan 10 19:30:36 2019 +0000
tree b7800a6fcb06eaf0ddad0c214cb189ae4c8f4b7b
parent 37a89a2a54ab53cf81c0e7508f82b7350175e56c

scripts/unit-test: Only export coverage data for coverage checking

Running binaries built with b_coverage=true will always output coverage
data so it can be collected later. We don't want our memcheck and
sanitizer code to run over these code paths. Only enable them for the
final coverage run.

Change-Id: I192089623f2b01ba17beea6ba14bc433a13a6497
Signed-off-by: William A. Kennington III <wak@google.com>

scripts/unit-test.py

diff --git a/scripts/unit-test.py b/scripts/unit-test.py
index 81ad017..6468bf1 100755
--- a/scripts/unit-test.py
+++ b/scripts/unit-test.py
@@ -405,7 +405,6 @@
         meson_options = parse_meson_options("meson_options.txt")
         meson_flags = [
             '-Db_colorout=never',
-            '-Db_coverage=' + str(build_for_testing).lower(),
         ]
         if build_for_testing:
             meson_flags.append('--buildtype=debug')
@@ -716,11 +715,18 @@
         # Run package unit tests
         build_and_install(UNIT_TEST_PKG, True)
         if os.path.isfile(CODE_SCAN_DIR + '/meson.build'):
-            check_call_cmd(top_dir, 'meson', 'test', '-C', 'build')
-            check_call_cmd(top_dir, 'ninja', '-C', 'build', 'coverage-html')
+            # Run valgrind if it is supported
             if is_valgrind_safe():
                 check_call_cmd(top_dir, 'meson', 'test', '-C', 'build',
                                '--wrap', 'valgrind')
+
+            # Run coverage checks
+            check_call_cmd(top_dir, 'meson', 'configure', 'build',
+                           '-Db_coverage=true')
+            check_call_cmd(top_dir, 'meson', 'test', '-C', 'build')
+            check_call_cmd(top_dir, 'ninja', '-C', 'build', 'coverage-html')
+            check_call_cmd(top_dir, 'meson', 'configure', 'build',
+                           '-Db_coverage=false')
         else:
             run_unit_tests(top_dir)
             maybe_run_valgrind(top_dir)