From 92be39d382e6866f9e4e564ee09692c63b560bc8 Mon Sep 17 00:00:00 2001 From: Raphael Isemann Date: Thu, 9 Aug 2018 15:57:43 +0000 Subject: Added missing null checks to fix r339351 llvm-svn: 339353 --- lldb/packages/Python/lldbsuite/test/lldbtest.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lldb/packages/Python/lldbsuite') 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, -- cgit v1.2.3