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

[Johnny Chen]

Author: johnny
Date: Wed Oct 19 15:51:28 2011
New Revision: 142543

URL: http://llvm.org/viewvc/llvm-project?rev=142543&view=rev
Log:
Temporarily relax the expected substrings for watchpoint creation output
due a bug in the decl file info of a global variable emitted by clang.

Modified:
    lldb/trunk/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
    lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.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=142543&r1=142542&r2=142543&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py Wed Oct 19 15:51:28 2011
@@ -60,7 +60,8 @@
         # 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)])
+                       #'%s:%d' % (self.source, self.decl)])
+                       ':%d' % (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=142543&r1=142542&r2=142543&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py Wed Oct 19 15:51:28 2011
@@ -113,7 +113,8 @@
         # 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)])
+                       #'%s:%d' % (self.source, self.decl)])
+                       ':%d' % (self.decl)])
 
         # Use the '-v' option to do verbose listing of the watchpoint.
         # The hit count should be 0 initially.
@@ -169,7 +170,8 @@
         # 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)])
+                       #'%s:%d' % (self.source, self.decl)])
+                       ':%d' % (self.decl)])
 
         # Delete the watchpoint immediately, but set auto-confirm to true first.
         self.runCmd("settings set auto-confirm true")
@@ -211,7 +213,8 @@
         # 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)])
+                       #'%s:%d' % (self.source, self.decl)])
+                       ':%d' % (self.decl)])
 
         # Set the ignore count of the watchpoint immediately.
         self.expect("watchpoint ignore -i 2",
@@ -257,7 +260,8 @@
         # 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)])
+                       #'%s:%d' % (self.source, self.decl)])
+                       ':%d' % (self.decl)])
 
         # Use the '-v' option to do verbose listing of the watchpoint.
         # The hit count should be 0 initially.
@@ -316,7 +320,8 @@
         # 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)])
+                       #'%s:%d' % (self.source, self.decl)])
+                       ':%d' % (self.decl)])
 
         # Immediately, we disable the watchpoint.  We won't be stopping due to a
         # watchpoint after this.