Moved logs into their own directory.

pull/15/head
Jussi Pakkanen 12 years ago
parent 17e5d8c6ac
commit 4d1ee0b8f2
  1. 6
      backends.py
  2. 8
      environment.py
  3. 2
      meson_test.py

@ -312,12 +312,12 @@ class NinjaBackend(Backend):
added_rule = True
elem = NinjaBuildElement('coverage-xml', 'CUSTOM_COMMAND', '')
elem.add_item('COMMAND', [gcovr_exe, '-x', '-r', self.environment.get_build_dir(),\
'-o', 'coverage.xml'])
'-o', os.path.join(self.environment.get_log_dir(), 'coverage.xml')])
elem.add_item('DESC', 'Generating XML coverage report.')
elem.write(outfile)
elem = NinjaBuildElement('coverage-text', 'CUSTOM_COMMAND', '')
elem.add_item('COMMAND', [gcovr_exe, '-r', self.environment.get_build_dir(),\
'-o', 'coverage.txt'])
'-o', os.path.join(self.environment.get_log_dir(), 'coverage.txt')])
elem.add_item('DESC', 'Generating text coverage report.')
elem.write(outfile)
if lcov_exe and genhtml_exe:
@ -329,7 +329,7 @@ class NinjaBackend(Backend):
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', 'coveragereport', '--title', 'Code coverage',\
'--output-directory', self.environment.get_log_dir(), '--title', 'Code coverage',\
'--legend', '--show-details', 'coverage.info']
elem.add_item('COMMAND', command)
elem.add_item('DESC', 'Generating HTML coverage report.')

@ -461,6 +461,7 @@ header_suffixes = ['h', 'hh', 'hpp', 'hxx', 'H']
class Environment():
private_dir = 'meson-private'
log_dir = 'meson-logs'
coredata_file = os.path.join(private_dir, 'coredata.dat')
def __init__(self, source_dir, build_dir, main_script_file, options):
@ -470,8 +471,9 @@ class Environment():
self.build_dir = build_dir
self.meson_script_file = main_script_file
self.scratch_dir = os.path.join(build_dir, Environment.private_dir)
self.log_dir = os.path.join(build_dir, Environment.log_dir)
os.makedirs(self.scratch_dir, exist_ok=True)
os.makedirs(self.log_dir, exist_ok=True)
try:
cdf = os.path.join(self.get_build_dir(), Environment.coredata_file)
self.coredata = coredata.load(cdf)
@ -514,6 +516,9 @@ class Environment():
def get_script_dir(self):
return os.path.dirname(self.meson_script_file)
def get_log_dir(self):
return self.log_dir
def get_coredata(self):
return self.coredata
@ -535,7 +540,6 @@ class Environment():
ccache = self.detect_ccache()
for compiler in compilers:
try:
print(compiler)
basename = os.path.basename(compiler).lower()
if basename == 'cl' or basename == 'cl.exe':
arg = '/?'

@ -30,7 +30,7 @@ def write_log(logfile, test_name, result_str, stdo, stde):
logfile.write('\n-------\n\n')
def run_tests(options, datafilename):
logfile_base = 'meson-private/testlog'
logfile_base = 'meson-logs/testlog'
if options.wrapper is None:
wrap = []
logfilename = logfile_base + '.txt'

Loading…
Cancel
Save