diff options
| author | Pavel Labath <labath@google.com> | 2016-04-14 15:52:53 +0000 |
|---|---|---|
| committer | Pavel Labath <labath@google.com> | 2016-04-14 15:52:53 +0000 |
| commit | e6961d0306d0631bb9218d2c88a8ca657259eb35 (patch) | |
| tree | baa4c88fd40233a7e7717e6a6388d52407a581e5 /lldb/packages/Python/lldbsuite/test/settings | |
| parent | f677cd539f0a71cd4b2ae9a990167ec6a98713ef (diff) | |
| download | bcm5719-llvm-e6961d0306d0631bb9218d2c88a8ca657259eb35.tar.gz bcm5719-llvm-e6961d0306d0631bb9218d2c88a8ca657259eb35.zip | |
[test] Relax stderr expectations on targets with chatty output
Summary:
On some android targets, a binary can produce additional garbage (e.g. warning messages from the
dynamic linker) on the standard error, which confuses some tests. This relaxes the stderr
expectations for targets known for their chattyness.
Reviewers: tfiala, ovyalov
Subscribers: tberghammer, danalbert, srhines, lldb-commits
Differential Revision: http://reviews.llvm.org/D19114
llvm-svn: 266326
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/settings')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/settings/TestSettings.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/settings/TestSettings.py b/lldb/packages/Python/lldbsuite/test/settings/TestSettings.py index c7aa8d3f108..9592fa9d6df 100644 --- a/lldb/packages/Python/lldbsuite/test/settings/TestSettings.py +++ b/lldb/packages/Python/lldbsuite/test/settings/TestSettings.py @@ -312,8 +312,11 @@ class SettingsCommandTestCase(TestBase): with open('stderr.txt', 'r') as f: output = f.read() - self.expect(output, exe=False, - startstr = "This message should go to standard error.") + message = "This message should go to standard error." + if lldbplatformutil.hasChattyStderr(self): + self.expect(output, exe=False, substrs = [message]) + else: + self.expect(output, exe=False, startstr = message) # The 'stdout.txt' file should now exist. self.assertTrue(os.path.isfile("stdout.txt"), |
