[Lldb-commits] [lldb] r112074 - /lldb/trunk/test/lldbtest.py

[Johnny Chen]

Author: johnny
Date: Wed Aug 25 14:00:04 2010
New Revision: 112074

URL: http://llvm.org/viewvc/llvm-project?rev=112074&view=rev
Log:
Fixed a logic error in the expect() method.  If the start string does not match,
there's no point matching further sub strings; the expect() already fails.

Also cleaned up the assert message for VARIABLES_DISPLAYED_CORRECTLY.

Modified:
    lldb/trunk/test/lldbtest.py

Modified: lldb/trunk/test/lldbtest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldbtest.py?rev=112074&r1=112073&r2=112074&view=diff
==============================================================================
--- lldb/trunk/test/lldbtest.py (original)
+++ lldb/trunk/test/lldbtest.py Wed Aug 25 14:00:04 2010
@@ -133,7 +133,7 @@
 
 DATA_TYPES_DISPLAYED_CORRECTLY = "Data type(s) displayed correctly"
 
-VARIABLES_DISPLAYED_CORRECTLY = "Show specified variable(s) correctly"
+VARIABLES_DISPLAYED_CORRECTLY = "Variable(s) displayed correctly"
 
 #
 # And a generic "Command '%s' returns successfully" message generator.
@@ -276,7 +276,7 @@
             print >> sys.stderr, "Matched" if matched else "Not matched"
             print >> sys.stderr
 
-        if substrs:
+        if substrs and matched:
             for str in substrs:
                 matched = output.find(str) > 0
                 if trace: