Added more informational assert message strings.

llvm-svn: 111536

13 files changed, 58 insertions, 62 deletions

diff --git a/lldb/test/array_types/TestArrayTypes.py b/lldb/test/array_types/TestArrayTypes.py
index a51f2cdb4dd..f5417468efd 100644
--- a/lldb/test/array_types/TestArrayTypes.py
+++ b/lldb/test/array_types/TestArrayTypes.py
@@ -18,7 +18,7 @@ class TestArrayTypes(TestBase):
 
         # Break on line 42 inside main().
         self.ci.HandleCommand("breakpoint set -f main.c -l 42", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint set'))
         self.assertTrue(res.GetOutput().startswith(
             "Breakpoint created: 1: file ='main.c', line = 42, locations = 1"),
                         BREAKPOINT_CREATED)
@@ -44,7 +44,7 @@ class TestArrayTypes(TestBase):
         # Issue 'variable list' command on several array-type variables.
 
         self.ci.HandleCommand("variable list strings", res);
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('variable list ...'))
         output = res.GetOutput()
         self.assertTrue(output.startswith('(char *[4])') and
                         output.find('(char *) strings[0]') > 0 and
@@ -58,18 +58,18 @@ class TestArrayTypes(TestBase):
                         VARIABLES_DISPLAYED_CORRECTLY)
 
         self.ci.HandleCommand("variable list char_16", res);
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('variable list ...'))
         self.assertTrue(res.GetOutput().find('(char) char_16[0]') > 0 and
                         res.GetOutput().find('(char) char_16[15]') > 0,
                         VARIABLES_DISPLAYED_CORRECTLY)
 
         self.ci.HandleCommand("variable list ushort_matrix", res);
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('variable list ...'))
         self.assertTrue(res.GetOutput().startswith('(unsigned short [2][3])'),
                         VARIABLES_DISPLAYED_CORRECTLY)
 
         self.ci.HandleCommand("variable list long_6", res);
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('variable list ...'))
         self.assertTrue(res.GetOutput().startswith('(long [6])'),
                         VARIABLES_DISPLAYED_CORRECTLY)
 
diff --git a/lldb/test/class_types/TestClassTypes.py b/lldb/test/class_types/TestClassTypes.py
index eff6ab35d43..5930fce7902 100644
--- a/lldb/test/class_types/TestClassTypes.py
+++ b/lldb/test/class_types/TestClassTypes.py
@@ -18,7 +18,7 @@ class TestClassTypes(TestBase):
 
         # Break on the ctor function of class C.
         self.ci.HandleCommand("breakpoint set -f main.cpp -l 73", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint list'))
         self.assertTrue(res.GetOutput().startswith(
             "Breakpoint created: 1: file ='main.cpp', line = 73, locations = 1"),
                         BREAKPOINT_CREATED)
@@ -37,13 +37,13 @@ class TestClassTypes(TestBase):
 
         # The breakpoint should have a hit count of 1.
         self.ci.HandleCommand("breakpoint list", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint list'))
         self.assertTrue(res.GetOutput().find(' resolved, hit count = 1') > 0,
                         BREAKPOINT_HIT_ONCE)
 
         # We should be stopped on the ctor function of class C.
         self.ci.HandleCommand("variable list this", res);
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('variable list ...'))
         self.assertTrue(res.GetOutput().startswith('(class C *const) this = '),
                         VARIABLES_DISPLAYED_CORRECTLY)
 
diff --git a/lldb/test/dead-strip/TestDeadStrip.py b/lldb/test/dead-strip/TestDeadStrip.py
index d37e268a90f..c9b67a58ce8 100644
--- a/lldb/test/dead-strip/TestDeadStrip.py
+++ b/lldb/test/dead-strip/TestDeadStrip.py
@@ -20,7 +20,7 @@ class TestDeadStrip(TestBase):
 
         # Break by function name f1 (live code).
         self.ci.HandleCommand("breakpoint set -s a.out -n f1", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint set'))
         self.assertTrue(res.GetOutput().startswith(
             "Breakpoint created: 1: name = 'f1', module = a.out, locations = 1"
             ),
@@ -28,7 +28,7 @@ class TestDeadStrip(TestBase):
 
         # Break by function name f2 (dead code).
         self.ci.HandleCommand("breakpoint set -s a.out -n f2", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint set'))
         self.assertTrue(res.GetOutput().startswith(
             "Breakpoint created: 2: name = 'f2', module = a.out, locations = 0 "
             "(pending)"),
@@ -36,7 +36,7 @@ class TestDeadStrip(TestBase):
 
         # Break by function name f3 (live code).
         self.ci.HandleCommand("breakpoint set -s a.out -n f3", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint set'))
         self.assertTrue(res.GetOutput().startswith(
             "Breakpoint created: 3: name = 'f3', module = a.out, locations = 1"
             ),
@@ -49,7 +49,7 @@ class TestDeadStrip(TestBase):
         # The stop reason of the thread should be breakpoint (breakpoint #1).
         self.ci.HandleCommand("thread list", res)
         output = res.GetOutput()
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('thread list'))
         self.assertTrue(output.find('state is Stopped') > 0 and
                         output.find('main.c:20') > 0 and
                         output.find('where = a.out`f1') > 0 and
@@ -58,17 +58,17 @@ class TestDeadStrip(TestBase):
 
         # The breakpoint should have a hit count of 1.
         self.ci.HandleCommand("breakpoint list 1", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint list'))
         self.assertTrue(res.GetOutput().find(' resolved, hit count = 1') > 0,
                         BREAKPOINT_HIT_ONCE)
 
         self.ci.HandleCommand("continue", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('continue'))
 
         # The stop reason of the thread should be breakpoint (breakpoint #3).
         self.ci.HandleCommand("thread list", res)
         output = res.GetOutput()
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('thread list'))
         self.assertTrue(output.find('state is Stopped') > 0 and
                         output.find('main.c:40') > 0 and
                         output.find('where = a.out`f3') > 0 and
@@ -77,7 +77,7 @@ class TestDeadStrip(TestBase):
 
         # The breakpoint should have a hit count of 1.
         self.ci.HandleCommand("breakpoint list 3", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint list'))
         self.assertTrue(res.GetOutput().find(' resolved, hit count = 1') > 0,
                         BREAKPOINT_HIT_ONCE)
 
diff --git a/lldb/test/function_types/TestFunctionTypes.py b/lldb/test/function_types/TestFunctionTypes.py
index eef4ede6990..8eafe7d1859 100644
--- a/lldb/test/function_types/TestFunctionTypes.py
+++ b/lldb/test/function_types/TestFunctionTypes.py
@@ -18,7 +18,7 @@ class TestFunctionTypes(TestBase):
 
         # Break inside the main.
         self.ci.HandleCommand("breakpoint set -f main.c -l 21", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint set'))
         self.assertTrue(res.GetOutput().startswith(
             "Breakpoint created: 1: file ='main.c', line = 21, locations = 1"),
                         BREAKPOINT_CREATED)
@@ -37,13 +37,13 @@ class TestFunctionTypes(TestBase):
 
         # The breakpoint should have a hit count of 1.
         self.ci.HandleCommand("breakpoint list", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint list'))
         self.assertTrue(res.GetOutput().find(' resolved, hit count = 1') > 0,
                         BREAKPOINT_HIT_ONCE)
 
         # Check that the 'callback' variable display properly.
         self.ci.HandleCommand("variable list callback", res);
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('variable list ...'))
         output = res.GetOutput()
         self.assertTrue(output.startswith('(int (*)(char const *)) callback ='),
                         VARIABLES_DISPLAYED_CORRECTLY)
@@ -52,11 +52,11 @@ class TestFunctionTypes(TestBase):
         self.ci.HandleCommand("breakpoint set -n string_not_empty", res);
         self.assertTrue(res.Succeeded(), BREAKPOINT_CREATED)
         self.ci.HandleCommand("continue", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('continue'))
 
         # Check that we do indeed stop on the string_not_empty function.
         self.ci.HandleCommand("process status", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('process status'))
         output = res.GetOutput()
         #print "process status =", output
         self.assertTrue(output.find('where = a.out`string_not_empty') > 0 and
diff --git a/lldb/test/global_variables/TestGlobalVariables.py b/lldb/test/global_variables/TestGlobalVariables.py
index ceb7c4dfc34..bd9e23e43f7 100644
--- a/lldb/test/global_variables/TestGlobalVariables.py
+++ b/lldb/test/global_variables/TestGlobalVariables.py
@@ -18,7 +18,7 @@ class TestGlobalVariables(TestBase):
 
         # Break inside the main.
         self.ci.HandleCommand("breakpoint set -f main.c -l 20", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint set'))
         self.assertTrue(res.GetOutput().startswith(
             "Breakpoint created: 1: file ='main.c', line = 20, locations = 1"),
                         BREAKPOINT_CREATED)
@@ -37,13 +37,13 @@ class TestGlobalVariables(TestBase):
 
         # The breakpoint should have a hit count of 1.
         self.ci.HandleCommand("breakpoint list", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint list'))
         self.assertTrue(res.GetOutput().find(' resolved, hit count = 1') > 0,
                         BREAKPOINT_HIT_ONCE)
 
         # Check that GLOBAL scopes are indicated for the variables.
         self.ci.HandleCommand("variable list -s -a", res);
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('variable list ...'))
         output = res.GetOutput()
         self.assertTrue(output.find('GLOBAL: g_file_static_cstr') > 0 and
                         output.find('g_file_static_cstr') > 0 and
diff --git a/lldb/test/help/TestHelp.py b/lldb/test/help/TestHelp.py
index 1989eb57151..53ab9846c65 100644
--- a/lldb/test/help/TestHelp.py
+++ b/lldb/test/help/TestHelp.py
@@ -17,9 +17,9 @@ class TestHelpCommand(TestBase):
         """A simple test of 'help' command and its output."""
         res = lldb.SBCommandReturnObject()
         self.ci.HandleCommand("help", res)
-        self.assertTrue(res.Succeeded())
-        self.assertTrue(res.GetOutput().startswith(
-            'The following is a list of built-in, permanent debugger commands'),
+        self.assertTrue(res.Succeeded() and
+                        res.GetOutput().startswith(
+                'The following is a list of built-in, permanent debugger commands'),
                         CMD_MSG('help'))
 
     def test_help_should_not_hang_emacsshell(self):
@@ -28,9 +28,9 @@ class TestHelpCommand(TestBase):
         self.ci.HandleCommand("set term-width 0", res)
         self.assertTrue(res.Succeeded(), CMD_MSG('set term-width 0'))
         self.ci.HandleCommand("help", res)
-        self.assertTrue(res.Succeeded())
-        self.assertTrue(res.GetOutput().startswith(
-            'The following is a list of built-in, permanent debugger commands'),
+        self.assertTrue(res.Succeeded() and
+                        res.GetOutput().startswith(
+                'The following is a list of built-in, permanent debugger commands'),
                         CMD_MSG('help'))
 
 
diff --git a/lldb/test/load_unload/TestLoadUnload.py b/lldb/test/load_unload/TestLoadUnload.py
index 16629e50b82..91d2bdf70e1 100644
--- a/lldb/test/load_unload/TestLoadUnload.py
+++ b/lldb/test/load_unload/TestLoadUnload.py
@@ -20,7 +20,7 @@ class TestLoadUnload(TestBase):
 
         # Break by function name a_function (not yet loaded).
         self.ci.HandleCommand("breakpoint set -n a_function", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint set'))
         self.assertTrue(res.GetOutput().startswith(
             "Breakpoint created: 1: name = 'a_function', locations = 0 "
             "(pending)"
@@ -43,7 +43,7 @@ class TestLoadUnload(TestBase):
 
         # The breakpoint should have a hit count of 1.
         self.ci.HandleCommand("breakpoint list", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint list'))
         self.assertTrue(res.GetOutput().find(' resolved, hit count = 1') > 0,
                         BREAKPOINT_HIT_ONCE)
 
diff --git a/lldb/test/order/TestOrderFile.py b/lldb/test/order/TestOrderFile.py
index 031c2eeed38..bd6ed54e395 100644
--- a/lldb/test/order/TestOrderFile.py
+++ b/lldb/test/order/TestOrderFile.py
@@ -21,7 +21,7 @@ class TestOrderFile(TestBase):
 
         # Test that the debug symbols have Function f3 before Function f1.
         self.ci.HandleCommand("image dump symtab a.out", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('image dump'))
         output = res.GetOutput()
         mo_f3 = re.search("Function +.+f3", output)
         mo_f1 = re.search("Function +.+f1", output)
diff --git a/lldb/test/persistent_variables/TestPersistentVariables.py b/lldb/test/persistent_variables/TestPersistentVariables.py
index 8aff13ad452..1c2de452838 100644
--- a/lldb/test/persistent_variables/TestPersistentVariables.py
+++ b/lldb/test/persistent_variables/TestPersistentVariables.py
@@ -19,7 +19,7 @@ class TestPersistentVariables(TestBase):
         self.assertTrue(res.Succeeded(), CURRENT_EXECUTABLE_SET)
 
         self.ci.HandleCommand("breakpoint set --name main", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint set'))
 
         self.ci.HandleCommand("run", res)
         self.runStarted = True
@@ -47,10 +47,6 @@ class TestPersistentVariables(TestBase):
         #print res.GetOutput()
         # $3 = (int)14
 
-        self.ci.HandleCommand("continue", res)
-        self.ci.HandleCommand("quit", res)
-        self.runStarted = False
-
 
 if __name__ == '__main__':
     import atexit
diff --git a/lldb/test/set_values/TestSetValues.py b/lldb/test/set_values/TestSetValues.py
index ac8bd3cdbc9..521f72fa9c9 100644
--- a/lldb/test/set_values/TestSetValues.py
+++ b/lldb/test/set_values/TestSetValues.py
@@ -18,27 +18,27 @@ class TestSetValues(TestBase):
 
         # Set breakpoints on several places to set program variables.
         self.ci.HandleCommand("breakpoint set -f main.c -l 15", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint set'))
         self.assertTrue(res.GetOutput().startswith(
             "Breakpoint created: 1: file ='main.c', line = 15, locations = 1"),
                         BREAKPOINT_CREATED)
         self.ci.HandleCommand("breakpoint set -f main.c -l 36", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint set'))
         self.assertTrue(res.GetOutput().startswith(
             "Breakpoint created: 2: file ='main.c', line = 36, locations = 1"),
                         BREAKPOINT_CREATED)
         self.ci.HandleCommand("breakpoint set -f main.c -l 57", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint set'))
         self.assertTrue(res.GetOutput().startswith(
             "Breakpoint created: 3: file ='main.c', line = 57, locations = 1"),
                         BREAKPOINT_CREATED)
         self.ci.HandleCommand("breakpoint set -f main.c -l 78", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint set'))
         self.assertTrue(res.GetOutput().startswith(
             "Breakpoint created: 4: file ='main.c', line = 78, locations = 1"),
                         BREAKPOINT_CREATED)
         self.ci.HandleCommand("breakpoint set -f main.c -l 85", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint set'))
         self.assertTrue(res.GetOutput().startswith(
             "Breakpoint created: 5: file ='main.c', line = 85, locations = 1"),
                         BREAKPOINT_CREATED)
@@ -57,26 +57,26 @@ class TestSetValues(TestBase):
 
         # The breakpoint should have a hit count of 1.
         self.ci.HandleCommand("breakpoint list", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint list'))
         self.assertTrue(res.GetOutput().find(' resolved, hit count = 1') > 0,
                         BREAKPOINT_HIT_ONCE)
 
         # main.c:15
         # Check that 'variable list' displays the correct data type and value.
         self.ci.HandleCommand("variable list", res);
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('variable list'))
         self.assertTrue(res.GetOutput().startswith("i = (char) 'a'"),
                         VARIABLES_DISPLAYED_CORRECTLY)
         # TODO:
         # Now set variable 'i' and check that it is correctly displayed.
 
         self.ci.HandleCommand("continue", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('continue'))
 
         # main.c:36
         # Check that 'variable list' displays the correct data type and value.
         self.ci.HandleCommand("variable list", res);
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('variable list'))
         self.assertTrue(res.GetOutput().startswith(
                 "i = (short unsigned int) 0x0021"),
                         VARIABLES_DISPLAYED_CORRECTLY)
@@ -84,36 +84,36 @@ class TestSetValues(TestBase):
         # Now set variable 'i' and check that it is correctly displayed.
 
         self.ci.HandleCommand("continue", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('continue'))
 
         # main.c:57
         # Check that 'variable list' displays the correct data type and value.
         self.ci.HandleCommand("variable list", res);
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('variable list'))
         self.assertTrue(res.GetOutput().startswith("i = (long int) 33"),
                         VARIABLES_DISPLAYED_CORRECTLY)
         # TODO:
         # Now set variable 'i' and check that it is correctly displayed.
 
         self.ci.HandleCommand("continue", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('continue'))
 
         # main.c:78
         # Check that 'variable list' displays the correct data type and value.
         self.ci.HandleCommand("variable list", res);
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('variable list'))
         self.assertTrue(res.GetOutput().startswith("i = (double) 3.14159"),
                         VARIABLES_DISPLAYED_CORRECTLY)
         # TODO:
         # Now set variable 'i' and check that it is correctly displayed.
 
         self.ci.HandleCommand("continue", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('continue'))
 
         # main.c:85
         # Check that 'variable list' displays the correct data type and value.
         self.ci.HandleCommand("variable list", res);
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('variable list'))
         self.assertTrue(res.GetOutput().startswith("i = (long double) "),
                         VARIABLES_DISPLAYED_CORRECTLY)
         # TODO:
diff --git a/lldb/test/stl/TestSTL.py b/lldb/test/stl/TestSTL.py
index fd572782702..0cad84ddf23 100644
--- a/lldb/test/stl/TestSTL.py
+++ b/lldb/test/stl/TestSTL.py
@@ -24,7 +24,7 @@ class TestSTL(TestBase):
 
         # Break on line 13 of main.cpp.
         self.ci.HandleCommand("breakpoint set -f main.cpp -l 13", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint set'))
         self.assertTrue(res.GetOutput().startswith(
             "Breakpoint created: 1: file ='main.cpp', line = 13, locations = 1"
             ),
@@ -37,7 +37,7 @@ class TestSTL(TestBase):
         # Stop at 'std::string hello_world ("Hello World!");'.
         self.ci.HandleCommand("thread list", res)
         #print "thread list ->", res.GetOutput()
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('thread list'))
         output = res.GetOutput()
         self.assertTrue(output.find('main.cpp:13') > 0 and
                         output.find('stop reason = breakpoint') > 0,
@@ -45,7 +45,7 @@ class TestSTL(TestBase):
 
         # The breakpoint should have a hit count of 1.
         self.ci.HandleCommand("breakpoint list", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint list'))
         self.assertTrue(res.GetOutput().find(' resolved, hit count = 1') > 0,
                         BREAKPOINT_HIT_ONCE)
 
@@ -61,7 +61,7 @@ class TestSTL(TestBase):
 
         self.ci.HandleCommand("thread backtrace", res)
         print "thread backtrace:", res.GetOutput()
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('thread backtarce'))
         output = res.GetOutput()
         self.assertTrue(output.find('[inlined]') > 0 and
                         output.find('basic_string.h'),
diff --git a/lldb/test/struct_types/TestStructTypes.py b/lldb/test/struct_types/TestStructTypes.py
index df83148e627..6ad0180ac9b 100644
--- a/lldb/test/struct_types/TestStructTypes.py
+++ b/lldb/test/struct_types/TestStructTypes.py
@@ -22,7 +22,7 @@ class TestStructTypes(TestBase):
 
         # Break on the ctor function of class C.
         self.ci.HandleCommand("breakpoint set -f main.c -l 14", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint set'))
         self.assertTrue(res.GetOutput().startswith(
             "Breakpoint created: 1: file ='main.c', line = 14, locations = 1"),
                         BREAKPOINT_CREATED)
@@ -35,7 +35,7 @@ class TestStructTypes(TestBase):
         # function where the original breakpoint was attempted.
         self.ci.HandleCommand("thread backtrace", res)
         #print "thread backtrace ->", res.GetOutput()
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('thread backtarce'))
         output = res.GetOutput()
         self.assertTrue(output.find('main.c:20') > 0 and
                         output.find('stop reason = breakpoint') > 0,
diff --git a/lldb/test/unsigned_types/TestUnsignedTypes.py b/lldb/test/unsigned_types/TestUnsignedTypes.py
index 91eb91ecddf..40a7d58eff1 100644
--- a/lldb/test/unsigned_types/TestUnsignedTypes.py
+++ b/lldb/test/unsigned_types/TestUnsignedTypes.py
@@ -21,7 +21,7 @@ class TestUnsignedTypes(TestBase):
 
         # Break on line 19 in main() aftre the variables are assigned values.
         self.ci.HandleCommand("breakpoint set -f main.cpp -l 19", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint set'))
         self.assertTrue(res.GetOutput().startswith(
             "Breakpoint created: 1: file ='main.cpp', line = 19, locations = 1"
             ),
@@ -40,14 +40,14 @@ class TestUnsignedTypes(TestBase):
 
         # The breakpoint should have a hit count of 1.
         self.ci.HandleCommand("breakpoint list", res)
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('breakpoint list'))
         self.assertTrue(res.GetOutput().find(' resolved, hit count = 1') > 0,
                         BREAKPOINT_HIT_ONCE)
 
         # Test that unsigned types display correctly.
         self.ci.HandleCommand("variable list -a", res)
         #print "variable list -a ->", res.GetOutput()
-        self.assertTrue(res.Succeeded())
+        self.assertTrue(res.Succeeded(), CMD_MSG('variable list -a'))
         output = res.GetOutput()
         self.assertTrue(
             output.startswith("the_unsigned_char = (unsigned char) 'c'")