diff options
author | Eli Schwartz <eschwartz@archlinux.org> | 2021-10-31 10:55:21 -0400 |
---|---|---|
committer | Eli Schwartz <eschwartz@archlinux.org> | 2021-11-01 18:57:14 -0400 |
commit | 0f0b1f22d2a1e835d7ee52cb7d391c3e29e9fecc (patch) | |
tree | c53bae58467e2842c1a7186a76cf6adec728d436 /mesonbuild/backend | |
parent | 86df7dd6273498e3256f4944b6b584636ae6ffb5 (diff) | |
download | meson-0f0b1f22d2a1e835d7ee52cb7d391c3e29e9fecc.zip meson-0f0b1f22d2a1e835d7ee52cb7d391c3e29e9fecc.tar.gz meson-0f0b1f22d2a1e835d7ee52cb7d391c3e29e9fecc.tar.bz2 |
coverage generator: obey the documentation and only generate supported outputs
We say:
> If version 4.2 or higher of the first is found, targets coverage-text,
> coverage-xml, coverage-sonarqube and coverage-html are generated.
But this is totally untrue. Make it true, by actually checking (and
not generating broken coverage commands when older versions of gcovr are
found).
Fixes #9505
Diffstat (limited to 'mesonbuild/backend')
-rw-r--r-- | mesonbuild/backend/ninjabackend.py | 60 |
1 files changed, 34 insertions, 26 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 9bc7f55..ba537b0 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -559,8 +559,14 @@ class NinjaBackend(backends.Backend): key = OptionKey('b_coverage') if (key in self.environment.coredata.options and self.environment.coredata.options[key].value): - self.add_build_comment(NinjaComment('Coverage rules')) - self.generate_coverage_rules() + gcovr_exe, gcovr_version, lcov_exe, genhtml_exe, _ = environment.find_coverage_tools() + if gcovr_exe or (lcov_exe and genhtml_exe): + self.add_build_comment(NinjaComment('Coverage rules')) + self.generate_coverage_rules(gcovr_exe, gcovr_version) + else: + # FIXME: since we explicitly opted in, should this be an error? + # The docs just say these targets will be created "if possible". + mlog.warning('Need gcovr or lcov/genhtml to generate any coverage reports') self.add_build_comment(NinjaComment('Suffix')) self.generate_utils() self.generate_ending() @@ -1070,37 +1076,16 @@ class NinjaBackend(backends.Backend): self.environment.get_log_dir()] + (['--use_llvm_cov'] if use_llvm_cov else [])) - def generate_coverage_rules(self): + def generate_coverage_rules(self, gcovr_exe: T.Optional[str], gcovr_version: T.Optional[str]): e = NinjaBuildElement(self.all_outputs, 'meson-coverage', 'CUSTOM_COMMAND', 'PHONY') self.generate_coverage_command(e, []) e.add_item('description', 'Generates coverage reports') self.add_build(e) # Alias that runs the target defined above self.create_target_alias('meson-coverage') - self.generate_coverage_legacy_rules() - - def generate_coverage_legacy_rules(self): - e = NinjaBuildElement(self.all_outputs, 'meson-coverage-xml', 'CUSTOM_COMMAND', 'PHONY') - self.generate_coverage_command(e, ['--xml']) - e.add_item('description', 'Generates XML coverage report') - self.add_build(e) - # 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') - self.add_build(e) - # Alias that runs the target defined above - self.create_target_alias('meson-coverage-text') + self.generate_coverage_legacy_rules(gcovr_exe, gcovr_version) + def generate_coverage_legacy_rules(self, gcovr_exe: T.Optional[str], gcovr_version: T.Optional[str]): e = NinjaBuildElement(self.all_outputs, 'meson-coverage-html', 'CUSTOM_COMMAND', 'PHONY') self.generate_coverage_command(e, ['--html']) e.add_item('description', 'Generates HTML coverage report') @@ -1108,6 +1093,29 @@ class NinjaBackend(backends.Backend): # Alias that runs the target defined above self.create_target_alias('meson-coverage-html') + if gcovr_exe: + e = NinjaBuildElement(self.all_outputs, 'meson-coverage-xml', 'CUSTOM_COMMAND', 'PHONY') + self.generate_coverage_command(e, ['--xml']) + e.add_item('description', 'Generates XML coverage report') + self.add_build(e) + # Alias that runs the target defined above + self.create_target_alias('meson-coverage-xml') + + 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') + self.add_build(e) + # Alias that runs the target defined above + self.create_target_alias('meson-coverage-text') + + if mesonlib.version_compare(gcovr_version, '>=4.2'): + 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') + def generate_install(self): self.create_install_data_files() elem = NinjaBuildElement(self.all_outputs, 'meson-install', 'CUSTOM_COMMAND', 'PHONY') |