Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Ensure any generation error appears in the logfile and thus in CI output 

Since c2a5ac39, MesonApp.generate() closes the logfile before returning,
which means that when invoked by mesonmain.run(), any MesonException is not
logged there.

MesonApp.generate() does not appear to have any other users I can find.

This somewhat reduces the diagnostic value of the logfile.

This also interacts badly with running project tests in CI, as _run_tests
chooses to report the logfile contents, rather than stdout, for the
configure step, and it thus doesn't report any configure error which caused
a test failure.
This commit is contained in:
Jon Turney 2018-02-12 20:00:26 +00:00 committed by Jussi Pakkanen
parent e2b5ac29d6
commit c027bb2c42
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mesonbuild/mesonmain.py
View File

@ -147,10 +147,7 @@ class MesonApp:
def generate(self): def generate(self):
env = environment.Environment(self.source_dir, self.build_dir, self.meson_script_launcher, self.options, self.original_cmd_line_args) env = environment.Environment(self.source_dir, self.build_dir, self.meson_script_launcher, self.options, self.original_cmd_line_args)
mlog.initialize(env.get_log_dir()) mlog.initialize(env.get_log_dir())
try: self._generate(env)
self._generate(env)
finally:
mlog.shutdown()
def _generate(self, env): def _generate(self, env):
mlog.debug('Build started at', datetime.datetime.now().isoformat()) mlog.debug('Build started at', datetime.datetime.now().isoformat())
@ -374,6 +371,7 @@ def run(original_args, mainfile=None):
# Error message # Error message
mlog.log(e) mlog.log(e)
# Path to log file # Path to log file
mlog.shutdown()
logfile = os.path.join(app.build_dir, environment.Environment.log_dir, mlog.log_fname) logfile = os.path.join(app.build_dir, environment.Environment.log_dir, mlog.log_fname)
mlog.log("\nA full log can be found at", mlog.bold(logfile)) mlog.log("\nA full log can be found at", mlog.bold(logfile))
if os.environ.get('MESON_FORCE_BACKTRACE'): if os.environ.get('MESON_FORCE_BACKTRACE'):
@ -383,4 +381,7 @@ def run(original_args, mainfile=None):
raise raise
traceback.print_exc() traceback.print_exc()
return 1 return 1
finally:
mlog.shutdown()
return 0 return 0