From b33e7bca73007aeec92ecada5642ce6fd08d6f58 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Wed, 10 Mar 2021 14:08:52 -0500 Subject: [PATCH] mlog: Add a space after 'subproject|' --- mesonbuild/mlog.py | 2 +- run_unittests.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mesonbuild/mlog.py b/mesonbuild/mlog.py index c1c323ba7..c7d586500 100644 --- a/mesonbuild/mlog.py +++ b/mesonbuild/mlog.py @@ -210,7 +210,7 @@ def force_print(*args: str, **kwargs: T.Any) -> None: raw = iostr.getvalue() if log_depth: - prepend = log_depth[-1] + '|' + prepend = log_depth[-1] + '| ' raw = prepend + raw.replace('\n', '\n' + prepend, raw.count('\n') - 1) # _Something_ is going to get printed. diff --git a/run_unittests.py b/run_unittests.py index c22f884b0..28ef486d4 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -4180,12 +4180,12 @@ class AllPlatformTests(BasePlatformTests): # Parent project warns correctly self.assertRegex(out, "WARNING: Project targeting '>=0.45'.*'0.47.0': dict") # Subprojects warn correctly - self.assertRegex(out, r"\|WARNING: Project targeting '>=0.40'.*'0.44.0': disabler") - self.assertRegex(out, r"\|WARNING: Project targeting '!=0.40'.*'0.44.0': disabler") + self.assertRegex(out, r"\| WARNING: Project targeting '>=0.40'.*'0.44.0': disabler") + self.assertRegex(out, r"\| WARNING: Project targeting '!=0.40'.*'0.44.0': disabler") # Subproject has a new-enough meson_version, no warning self.assertNotRegex(out, "WARNING: Project targeting.*Python") # Ensure a summary is printed in the subproject and the outer project - self.assertRegex(out, r"\|WARNING: Project specifies a minimum meson_version '>=0.40'") + self.assertRegex(out, r"\| WARNING: Project specifies a minimum meson_version '>=0.40'") self.assertRegex(out, r"\| \* 0.44.0: {'disabler'}") self.assertRegex(out, "WARNING: Project specifies a minimum meson_version '>=0.45'") self.assertRegex(out, " * 0.47.0: {'dict'}")