aboutsummaryrefslogtreecommitdiff
path: root/run_unittests.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2021-03-23 17:28:26 +0200
committerGitHub <noreply@github.com>2021-03-23 17:28:26 +0200
commitde9df5128c03d016ec9463f705422f2e1df4c49a (patch)
tree143434ec0a4efb3b0219e33940798d6d9963696c /run_unittests.py
parent9ab4dadef99cacb6a556154b7f520afba0877dc4 (diff)
parent8cd4d0b2832666f19660b9006040e5ff7e5d4576 (diff)
downloadmeson-de9df5128c03d016ec9463f705422f2e1df4c49a.zip
meson-de9df5128c03d016ec9463f705422f2e1df4c49a.tar.gz
meson-de9df5128c03d016ec9463f705422f2e1df4c49a.tar.bz2
Merge pull request #7491 from xclaesse/callstack
RFC: logs: Prepend current subproject name to all messages
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-xrun_unittests.py6
1 files changed, 3 insertions, 3 deletions
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'}")