Added missing null checks to fix r339351

llvm-svn: 339353

diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py
index 1c8b1d6..b287a0f 100644 (file)
--- 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,