[Lldb-commits] [lldb] r143118 - in /lldb/trunk/test/functionalities/watchpoint: hello_watchpoint/TestMyFirstWatchpoint.py watchpoint_commands/TestWatchpointCommands.py watchpoint_commands/condition/TestWatchpointConditionCmd.py

[Johnny Chen]

Author: johnny
Date: Thu Oct 27 13:27:52 2011
New Revision: 143118

URL: http://llvm.org/viewvc/llvm-project?rev=143118&view=rev
Log:
Undo r142549 and r142543 which temporarily relax the expected substrings for
watchpoint creation output due to wrong debug info from clang.  It has been
fixed.

Modified:
    lldb/trunk/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
    lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
    lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py

Modified: lldb/trunk/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py?rev=143118&r1=143117&r2=143118&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py Thu Oct 27 13:27:52 2011
@@ -60,8 +60,7 @@
         # There should be only one watchpoint hit (see main.c).
         self.expect("frame variable -w write -g -L global", WATCHPOINT_CREATED,
             substrs = ['Watchpoint created', 'size = 4', 'type = w',
-                       #'%s:%d' % (self.source, self.decl)])
-                       ':%d' % (self.decl)])
+                       '%s:%d' % (self.source, self.decl)])
 
         # Use the '-v' option to do verbose listing of the watchpoint.
         # The hit count should be 0 initially.

Modified: lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py?rev=143118&r1=143117&r2=143118&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py Thu Oct 27 13:27:52 2011
@@ -113,8 +113,7 @@
         # There should be two watchpoint hits (see main.c).
         self.expect("frame variable -w read_write -g -L global", WATCHPOINT_CREATED,
             substrs = ['Watchpoint created', 'size = 4', 'type = rw',
-                       #'%s:%d' % (self.source, self.decl)])
-                       ':%d' % (self.decl)])
+                       '%s:%d' % (self.source, self.decl)])
 
         # Use the '-v' option to do verbose listing of the watchpoint.
         # The hit count should be 0 initially.
@@ -170,8 +169,7 @@
         # There should be two watchpoint hits (see main.c).
         self.expect("frame variable -w read_write -g -L global", WATCHPOINT_CREATED,
             substrs = ['Watchpoint created', 'size = 4', 'type = rw',
-                       #'%s:%d' % (self.source, self.decl)])
-                       ':%d' % (self.decl)])
+                       '%s:%d' % (self.source, self.decl)])
 
         # Delete the watchpoint immediately, but set auto-confirm to true first.
         self.runCmd("settings set auto-confirm true")
@@ -213,8 +211,7 @@
         # There should be two watchpoint hits (see main.c).
         self.expect("frame variable -w read_write -g -L global", WATCHPOINT_CREATED,
             substrs = ['Watchpoint created', 'size = 4', 'type = rw',
-                       #'%s:%d' % (self.source, self.decl)])
-                       ':%d' % (self.decl)])
+                       '%s:%d' % (self.source, self.decl)])
 
         # Set the ignore count of the watchpoint immediately.
         self.expect("watchpoint ignore -i 2",
@@ -260,8 +257,7 @@
         # There should be two watchpoint hits (see main.c).
         self.expect("frame variable -w read_write -g -L global", WATCHPOINT_CREATED,
             substrs = ['Watchpoint created', 'size = 4', 'type = rw',
-                       #'%s:%d' % (self.source, self.decl)])
-                       ':%d' % (self.decl)])
+                       '%s:%d' % (self.source, self.decl)])
 
         # Use the '-v' option to do verbose listing of the watchpoint.
         # The hit count should be 0 initially.
@@ -320,8 +316,7 @@
         # There should be two watchpoint hits (see main.c).
         self.expect("frame variable -w read_write -g -L global", WATCHPOINT_CREATED,
             substrs = ['Watchpoint created', 'size = 4', 'type = rw',
-                       #'%s:%d' % (self.source, self.decl)])
-                       ':%d' % (self.decl)])
+                       '%s:%d' % (self.source, self.decl)])
 
         # Immediately, we disable the watchpoint.  We won't be stopping due to a
         # watchpoint after this.

Modified: lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py?rev=143118&r1=143117&r2=143118&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py Thu Oct 27 13:27:52 2011
@@ -60,8 +60,7 @@
         # With a condition of 'global==5'.
         self.expect("frame variable -w write -g -L global", WATCHPOINT_CREATED,
             substrs = ['Watchpoint created', 'size = 4', 'type = w',
-                       #'%s:%d' % (self.source, self.decl)])
-                       ':%d' % (self.decl)])
+                       '%s:%d' % (self.source, self.decl)])
 
         self.runCmd("watchpoint modify -c 'global==5'")