From 2e30b5a1e2ca21555bb3aa50f91e87f4d2821bb6 Mon Sep 17 00:00:00 2001 From: Weston Schmidt Date: Tue, 13 Jul 2021 03:17:27 -0700 Subject: Add support for gcovr --sonarqube report Sonarcloud.io only can read the sonarqube based report that gcovr can produce. This change enables support for this output in meson and ninja. Signed-off-by: Weston Schmidt --- mesonbuild/backend/ninjabackend.py | 7 +++++++ mesonbuild/scripts/coverage.py | 14 ++++++++++++++ 2 files changed, 21 insertions(+) (limited to 'mesonbuild') diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 85a5f363c..31d981313 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1064,6 +1064,13 @@ class NinjaBackend(backends.Backend): # Alias that runs the target defined above self.create_target_alias('meson-coverage-xml') + e = NinjaBuildElement(self.all_outputs, 'meson-coverage-sonarqube', 'CUSTOM_COMMAND', 'PHONY') + self.generate_coverage_command(e, ['--sonarqube']) + e.add_item('description', 'Generates Sonarqube XML coverage report') + self.add_build(e) + # Alias that runs the target defined above + self.create_target_alias('meson-coverage-sonarqube') + e = NinjaBuildElement(self.all_outputs, 'meson-coverage-text', 'CUSTOM_COMMAND', 'PHONY') self.generate_coverage_command(e, ['--text']) e.add_item('description', 'Generates text coverage report') diff --git a/mesonbuild/scripts/coverage.py b/mesonbuild/scripts/coverage.py index b60d5d1e3..2bd93e8a5 100644 --- a/mesonbuild/scripts/coverage.py +++ b/mesonbuild/scripts/coverage.py @@ -46,6 +46,18 @@ def coverage(outputs: T.List[str], source_root: str, subproject_root: str, build print('gcovr >= 3.3 needed to generate Xml coverage report') exitcode = 1 + if not outputs or 'sonarqube' in outputs: + if gcovr_exe: + subprocess.check_call(gcovr_base_cmd + + ['--sonarqube', + '-o', os.path.join(log_dir, 'sonarqube.xml'), + '-e', subproject_root + ] + gcov_exe_args) + outfiles.append(('Sonarqube', pathlib.Path(log_dir, 'sonarqube.xml'))) + elif outputs: + print('gcovr >= 4.2 needed to generate Xml coverage report') + exitcode = 1 + if not outputs or 'text' in outputs: if gcovr_exe: subprocess.check_call(gcovr_base_cmd + @@ -156,6 +168,8 @@ def run(args: T.List[str]) -> int: const='text', help='generate Text report') parser.add_argument('--xml', dest='outputs', action='append_const', const='xml', help='generate Xml report') + parser.add_argument('--sonarqube', dest='outputs', action='append_const', + const='sonarqube', help='generate Sonarqube Xml report') parser.add_argument('--html', dest='outputs', action='append_const', const='html', help='generate Html report') parser.add_argument('--use_llvm_cov', action='store_true', -- cgit v1.2.3