aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHemmo Nieminen <hemmo.nieminen@iki.fi>2016-04-28 20:55:02 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2016-05-01 18:22:47 +0300
commit1d7201dd3547dadebc6c18845d7b333ce0b6ba1d (patch)
treee09f811613b9abcf01913dcdb6b307cb03328eb1
parente8f3e1ef3abf565d5dffe72f201e204555f019fe (diff)
downloadmeson-1d7201dd3547dadebc6c18845d7b333ce0b6ba1d.zip
meson-1d7201dd3547dadebc6c18845d7b333ce0b6ba1d.tar.gz
meson-1d7201dd3547dadebc6c18845d7b333ce0b6ba1d.tar.bz2
Move all coverage reporting related files under $BUILD_DIR/meson-logs.
-rw-r--r--mesonbuild/backend/ninjabackend.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index dada84f..9ec10f5 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -442,16 +442,16 @@ int dummy;
elem.write(outfile)
if lcov_exe and genhtml_exe:
added_rule = True
- phony_elem = NinjaBuildElement(self.all_outputs, 'coverage-html', 'phony', 'coveragereport/index.html')
- phony_elem.write(outfile)
-
- elem = NinjaBuildElement(self.all_outputs, 'coveragereport/index.html', 'CUSTOM_COMMAND', '')
htmloutdir = os.path.join(self.environment.get_log_dir(), 'coveragereport')
+ covinfo = os.path.join(self.environment.get_log_dir(), 'coverage.info')
+ phony_elem = NinjaBuildElement(self.all_outputs, 'coverage-html', 'phony', os.path.join(htmloutdir, 'index.html'))
+ phony_elem.write(outfile)
+ elem = NinjaBuildElement(self.all_outputs, os.path.join(htmloutdir, 'index.html'), 'CUSTOM_COMMAND', '')
command = [lcov_exe, '--directory', self.environment.get_build_dir(),\
- '--capture', '--output-file', 'coverage.info', '--no-checksum',\
+ '--capture', '--output-file', covinfo, '--no-checksum',\
'&&', genhtml_exe, '--prefix', self.environment.get_build_dir(),\
'--output-directory', htmloutdir, '--title', 'Code coverage',\
- '--legend', '--show-details', 'coverage.info']
+ '--legend', '--show-details', covinfo]
elem.add_item('COMMAND', command)
elem.add_item('DESC', 'Generating HTML coverage report.')
elem.write(outfile)