More descriptive trace messages for the matchings of start and sub strings.

llvm-svn: 112000

1 files changed, 9 insertions, 4 deletions

diff --git a/lldb/test/lldbtest.py b/lldb/test/lldbtest.py
index 1ea941c8a47..b9e211e4237 100644
--- a/lldb/test/lldbtest.py
+++ b/lldb/test/lldbtest.py
@@ -250,16 +250,21 @@ class TestBase(unittest2.TestCase):
         output = self.res.GetOutput()
         matched = output.startswith(startstr) if startstr else True
 
-        if not matched and startstr and trace:
-            print >> sys.stderr, "Startstr not matched:", startstr
+        if startstr and trace:
+            print >> sys.stderr, "Expecting start string:", startstr
+            print >> sys.stderr, "Matched" if matched else "Not matched"
+            print >> sys.stderr
 
         if substrs:
             for str in substrs:
                 matched = output.find(str) > 0
+                if trace:
+                    print >> sys.stderr, "Expecting sub string:", str
+                    print >> sys.stderr, "Matched" if matched else "Not matched"
                 if not matched:
-                    if trace:
-                        print >> sys.stderr, "Substring not matched:", str
                     break
+            if trace:
+                print >> sys.stderr
 
         self.assertTrue(matched, msg if msg else CMD_MSG(cmd))