diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2022-05-22 12:22:54 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2022-06-13 17:17:53 -0400 |
| commit | 036181ef6a3e9890a2e50a3b4d84851b15c52e94 (patch) | |
| tree | 6ff9bbe590dbd93f4147fd06642d8f1b17650685 /unittests | |
| parent | 2acb6ee79e24db047800da30f5f4ac52cb9c012d (diff) | |
| download | meson-036181ef6a3e9890a2e50a3b4d84851b15c52e94.zip meson-036181ef6a3e9890a2e50a3b4d84851b15c52e94.tar.gz meson-036181ef6a3e9890a2e50a3b4d84851b15c52e94.tar.bz2 | |
unittests: do more accurate check for ninja "nothing to do"
We only want to scan stdout for these strings, and particularly, if we
allow `-d explain` to be mingled into stdout, then buffering issues
across OSes can lead to inaccurate results.
Diffstat (limited to 'unittests')
| -rw-r--r-- | unittests/baseplatformtests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unittests/baseplatformtests.py b/unittests/baseplatformtests.py index 09bde6b..4582188 100644 --- a/unittests/baseplatformtests.py +++ b/unittests/baseplatformtests.py @@ -385,7 +385,7 @@ class BasePlatformTests(TestCase): def assertReconfiguredBuildIsNoop(self): 'Assert that we reconfigured and then there was nothing to do' - ret = self.build() + ret = self.build(stderr=False) self.assertIn('The Meson build system', ret) if self.backend is Backend.ninja: for line in ret.split('\n'): @@ -407,7 +407,7 @@ class BasePlatformTests(TestCase): raise RuntimeError(f'Invalid backend: {self.backend.name!r}') def assertBuildIsNoop(self): - ret = self.build() + ret = self.build(stderr=False) if self.backend is Backend.ninja: self.assertIn(ret.split('\n')[-2], self.no_rebuild_stdout) elif self.backend is Backend.vs: |