diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-03-10 14:08:52 -0500 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2021-03-22 21:29:14 -0400 |
| commit | b33e7bca73007aeec92ecada5642ce6fd08d6f58 (patch) | |
| tree | 3098d44270069df3d97aa110e03509a87297fdab | |
| parent | 3c1ccb923fc110fa86893b3e7cbbfa0b75c9a4dc (diff) | |
| download | meson-b33e7bca73007aeec92ecada5642ce6fd08d6f58.zip meson-b33e7bca73007aeec92ecada5642ce6fd08d6f58.tar.gz meson-b33e7bca73007aeec92ecada5642ce6fd08d6f58.tar.bz2 | |
mlog: Add a space after 'subproject|'
| -rw-r--r-- | mesonbuild/mlog.py | 2 | ||||
| -rwxr-xr-x | run_unittests.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/mlog.py b/mesonbuild/mlog.py index c1c323b..c7d5865 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 c22f884..28ef486 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'}") |