From ea3a9af832ab141235c5b07431c9d526161b527d Mon Sep 17 00:00:00 2001 From: Johnny Chen Date: Thu, 27 Oct 2011 18:27:52 +0000 Subject: [PATCH] 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 --- .../hello_watchpoint/TestMyFirstWatchpoint.py | 3 +-- .../watchpoint_commands/TestWatchpointCommands.py | 15 +++++---------- .../condition/TestWatchpointConditionCmd.py | 3 +-- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py b/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py index 6002d4577317..5cb8eeb2ca25 100644 --- a/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py +++ b/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py @@ -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. diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py b/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py index efefce95f361..2dcbe65d3e11 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py @@ -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. diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py b/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py index e5de8f88749e..4f7168ab4f14 100644 --- a/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py +++ b/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py @@ -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'") -- GitLab