diff options
| author | Raphael Isemann <teemperor@gmail.com> | 2018-08-09 15:57:43 +0000 |
|---|---|---|
| committer | Raphael Isemann <teemperor@gmail.com> | 2018-08-09 15:57:43 +0000 |
| commit | 92be39d382e6866f9e4e564ee09692c63b560bc8 (patch) | |
| tree | c9522af928f3dcaf49ac48cc67c2f975ab537733 /lldb/packages/Python/lldbsuite/test/lldbtest.py | |
| parent | f3bde0485c2451487c0debc8719d290d56eb7009 (diff) | |
| download | bcm5719-llvm-92be39d382e6866f9e4e564ee09692c63b560bc8.tar.gz bcm5719-llvm-92be39d382e6866f9e4e564ee09692c63b560bc8.zip | |
Added missing null checks to fix r339351
llvm-svn: 339353
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/lldbtest.py')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/lldbtest.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py index 1c8b1d6bc22..b287a0feea1 100644 --- a/lldb/packages/Python/lldbsuite/test/lldbtest.py +++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py @@ -2079,8 +2079,12 @@ class TestBase(Base): output += "\nCommand output:\n" + self.res.GetOutput() if self.res.GetError(): output += "\nError output:\n" + self.res.GetError() + if msg: + msg += output + if cmd: + cmd += output self.assertTrue(self.res.Succeeded(), - msg if (msg + output) else CMD_MSG(cmd + output)) + msg if (msg) else CMD_MSG(cmd)) def match( self, |
