diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-04-03 17:27:14 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-04-03 17:27:14 +0300 |
| commit | 4352398caf518da858f0b4bdf053747efcf3a6a1 (patch) | |
| tree | e27f4c9db52b75f0cb5b6f557b9f4cb9ce0e682c /mesonbuild/backend | |
| parent | 6291fb4056de513a64ad52b65e9f4166323d35f3 (diff) | |
| download | meson-4352398caf518da858f0b4bdf053747efcf3a6a1.zip meson-4352398caf518da858f0b4bdf053747efcf3a6a1.tar.gz meson-4352398caf518da858f0b4bdf053747efcf3a6a1.tar.bz2 | |
Fix output dir of coverage-html.
Diffstat (limited to 'mesonbuild/backend')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index ef40c4e..00b711d 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -184,9 +184,8 @@ int dummy; self.generate_tests(outfile) outfile.write('# Install rules\n\n') self.generate_install(outfile) - if 'b_coverage' in self.environment.coredata.base_options and\ + if 'b_coverage' in self.environment.coredata.base_options and \ self.environment.coredata.base_options['b_coverage'].value: - print(bool(self.environment.coredata.base_options.get('b_coverage', False))) outfile.write('# Coverage rules\n\n') self.generate_coverage_rules(outfile) outfile.write('# Suffix\n\n') @@ -448,10 +447,11 @@ int dummy; phony_elem.write(outfile) elem = NinjaBuildElement(self.all_outputs, 'coveragereport/index.html', 'CUSTOM_COMMAND', '') + htmloutdir = os.path.join(self.environment.get_log_dir(), 'coveragereport') command = [lcov_exe, '--directory', self.environment.get_build_dir(),\ '--capture', '--output-file', 'coverage.info', '--no-checksum',\ '&&', genhtml_exe, '--prefix', self.environment.get_build_dir(),\ - '--output-directory', self.environment.get_log_dir(), '--title', 'Code coverage',\ + '--output-directory', htmloutdir, '--title', 'Code coverage',\ '--legend', '--show-details', 'coverage.info'] elem.add_item('COMMAND', command) elem.add_item('DESC', 'Generating HTML coverage report.') |