Author: teemperor Date: Thu Aug 9 08:57:43 2018 New Revision: 339353 URL: http://llvm.org/viewvc/llvm-project?rev=339353&view=rev Log: Added missing null checks to fix r339351
Modified: lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py Modified: lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py?rev=339353&r1=339352&r2=339353&view=diff ============================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py (original) +++ lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py Thu Aug 9 08:57:43 2018 @@ -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, _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits