Merge pull request #1775 An error occurred from mesonbuild/covupdate

Better coverage report

mesonbuild/backend/ninjabackend.py

@@ -570,6 +570,18 @@ int dummy;
         self.processed_targets[target.name + target.type_suffix()] = True
 
     def generate_coverage_rules(self, outfile):
+        e = NinjaBuildElement(self.all_outputs, 'coverage', 'CUSTOM_COMMAND', 'PHONY')
+        e.add_item('COMMAND', [sys.executable,
+                               self.environment.get_build_command(),
+                               '--internal', 'coverage',
+                               self.environment.get_source_dir(),
+                               self.environment.get_build_dir(),
+                               self.environment.get_log_dir()])
+        e.add_item('description', 'Generates coverage reports.')
+        e.write(outfile)
+        self.generate_coverage_legacy_rules(outfile)
+
+    def generate_coverage_legacy_rules(self, outfile):
         (gcovr_exe, lcov_exe, genhtml_exe) = environment.find_coverage_tools()
         added_rule = False
         if gcovr_exe:

mesonbuild/coredata.py

@@ -334,6 +334,7 @@ forbidden_target_names = {'clean': None,
                           'clean-ctlist': None,
                           'clean-gcno': None,
                           'clean-gcda': None,
+                          'coverage': None,
                           'coverage-text': None,
                           'coverage-xml': None,
                           'coverage-html': None,

mesonbuild/mesonmain.py

@@ -249,6 +249,9 @@ def run_script_command(args):
     elif cmdname == 'dist':
         import mesonbuild.scripts.dist as abc
         cmdfunc = abc.run
+    elif cmdname == 'coverage':
+        import mesonbuild.scripts.coverage as abc
+        cmdfunc = abc.run
     else:
         raise MesonException('Unknown internal command {}.'.format(cmdname))
     return cmdfunc(cmdargs)

mesonbuild/scripts/coverage.py

@@ -0,0 +1,79 @@
+# Copyright 2017 The Meson development team
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#     http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from mesonbuild import environment
+
+import sys, os, subprocess
+
+def remove_dir_from_trace(lcov_command, covfile, dirname):
+    tmpfile = covfile + '.tmp'
+    subprocess.check_call([lcov_command, '--remove', covfile, dirname, '-o', tmpfile])
+    os.replace(tmpfile, covfile)
+
+def coverage(source_root, build_root, log_dir):
+    (gcovr_exe, lcov_exe, genhtml_exe) = environment.find_coverage_tools()
+    if gcovr_exe:
+        subprocess.check_call([gcovr_exe,
+                               '-x',
+                               '-r', source_root,
+                               '-o', os.path.join(log_dir, 'coverage.xml'),
+                               ])
+        subprocess.check_call([gcovr_exe,
+                               '-r', source_root,
+                               '-o', os.path.join(log_dir, 'coverage.txt'),
+                               ])
+    if lcov_exe and genhtml_exe:
+        htmloutdir = os.path.join(log_dir, 'coveragereport')
+        covinfo = os.path.join(log_dir, 'coverage.info')
+        initial_tracefile = covinfo + '.initial'
+        run_tracefile = covinfo + '.run'
+        subprocess.check_call([lcov_exe,
+                               '--directory', build_root,
+                               '--capture',
+                               '--initial',
+                               '--output-file',
+                               initial_tracefile])
+        subprocess.check_call([lcov_exe,
+                               '--directory', build_root,
+                               '--capture',
+                               '--output-file', run_tracefile,
+                               '--no-checksum',
+                               '--rc', 'lcov_branch_coverage=1',
+                               ])
+        # Join initial and test results.
+        subprocess.check_call([lcov_exe,
+                               '-a', initial_tracefile,
+                               '-a', run_tracefile,
+                               '-o', covinfo])
+        remove_dir_from_trace(lcov_exe, covinfo, '/usr/include/*')
+        remove_dir_from_trace(lcov_exe, covinfo, '/usr/local/include/*')
+        subprocess.check_call([genhtml_exe,
+                               '--prefix', build_root,
+                               '--output-directory', htmloutdir,
+                               '--title', 'Code coverage',
+                               '--legend',
+                               '--show-details',
+                               '--branch-coverage',
+                               covinfo])
+    return 0
+
+def run(args):
+    if not os.path.isfile('build.ninja'):
+        print('Coverage currently only works with the Ninja backend.')
+        return 1
+    source_root, build_root, log_dir = args[:]
+    return coverage(source_root, build_root, log_dir)
+
+if __name__ == '__main__':
+    sys.exit(run(sys.argv[1:]))