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

Use consistent mlog formatting with the ConfigTool dependency helpers 

This just adds more consistent use of mlog.bold and mlog.red/green for
ConfigTool based dependencies.
This commit is contained in:
Dylan Baker 2017-12-13 10:06:38 -08:00
parent 2b2ee68f90
commit 7cd41ee8fb
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mesonbuild/dependencies/base.py
View File

@ -284,17 +284,18 @@ class ConfigToolDependency(ExternalDependency):
"""Helper method to print messages about the tool.""" """Helper method to print messages about the tool."""
if self.config is None: if self.config is None:
if version is not None: if version is not None:
mlog.log('found {} {!r} but need:'.format(self.tool_name, version), mlog.log('Found', mlog.bold(self.tool_name), repr(version),
req_version) mlog.red('NO'), '(needed', req_version, ')')
else: else:
mlog.log("No {} found; can't detect dependency".format(self.tool_name)) mlog.log('Found', mlog.bold(self.tool_name), repr(req_version),
mlog.log('Dependency {} found:'.format(self.name), mlog.red('NO')) mlog.red('NO'))
mlog.log('Dependency', mlog.bold(self.name), 'found:', mlog.red('NO'))
if self.required: if self.required:
raise DependencyException('Dependency {} not found'.format(self.name)) raise DependencyException('Dependency {} not found'.format(self.name))
return False return False
mlog.log('Found {}:'.format(self.tool_name), mlog.bold(shutil.which(self.config)), mlog.log('Found {}:'.format(self.tool_name), mlog.bold(shutil.which(self.config)),
'({})'.format(version)) '({})'.format(version))
mlog.log('Dependency {} found:'.format(self.name), mlog.green('YES')) mlog.log('Dependency', mlog.bold(self.name), 'found:', mlog.green('YES'))
return True return True
def get_config_value(self, args, stage): def get_config_value(self, args, stage):

2
run_unittests.py
View File

@ -1741,7 +1741,7 @@ class FailureTests(BasePlatformTests):
raise unittest.SkipTest('wx-config or wx-config-3.0 found') raise unittest.SkipTest('wx-config or wx-config-3.0 found')
self.assertMesonRaises("dependency('wxwidgets')", self.dnf) self.assertMesonRaises("dependency('wxwidgets')", self.dnf)
self.assertMesonOutputs("dependency('wxwidgets', required : false)", self.assertMesonOutputs("dependency('wxwidgets', required : false)",
"No wx-config found;") "Dependency .*WxWidgets.* found: .*NO.*")
def test_wx_dependency(self): def test_wx_dependency(self):
if not shutil.which('wx-config-3.0') and not shutil.which('wx-config'): if not shutil.which('wx-config-3.0') and not shutil.which('wx-config'):