maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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.

llvm-svn: 143118
This commit is contained in:
Johnny Chen 2011-10-27 18:27:52 +00:00
parent 652f576a70
commit ea3a9af832
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
View File

@ -60,8 +60,7 @@ class HelloWatchpointTestCase(TestBase):
# 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.

15
lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
View File

@ -113,8 +113,7 @@ class WatchpointCommandsTestCase(TestBase):
# 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 @@ class WatchpointCommandsTestCase(TestBase):
# 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 @@ class WatchpointCommandsTestCase(TestBase):
# 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 @@ class WatchpointCommandsTestCase(TestBase):
# 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 @@ class WatchpointCommandsTestCase(TestBase):
# 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.

3
lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
View File

@ -60,8 +60,7 @@ class WatchpointConditionCmdTestCase(TestBase):
# 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'")