Missed a few places where I didn't delete the obsolete (commented out) version of...

llvm-svn: 164436

diff --git a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py b/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
index 82da6ba..7eb3acf 100644 (file)
--- a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
+++ b/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
@@ -47,20 +47,8 @@ class BreakpointCommandTestCase(TestBase):
         # Add three breakpoints on the same line.  The first time we don't specify the file,
         # since the default file is the one containing main:
         lldbutil.run_break_set_by_file_and_line (self, None, self.line, num_expected_locations=1, loc_exact=True)
-#        self.expect("breakpoint set -l %d" % self.line,
-#                    BREAKPOINT_CREATED,
-#            startstr = "Breakpoint created: 1: file ='main.c', line = %d, locations = 1" %
-#                        self.line)
         lldbutil.run_break_set_by_file_and_line (self, "main.c", self.line, num_expected_locations=1, loc_exact=True)
-#        self.expect("breakpoint set -f main.c -l %d" % self.line,
-#                    BREAKPOINT_CREATED,
-#            startstr = "Breakpoint created: 2: file ='main.c', line = %d, locations = 1" %
-#                        self.line)
         lldbutil.run_break_set_by_file_and_line (self, "main.c", self.line, num_expected_locations=1, loc_exact=True)
-#        self.expect("breakpoint set -f main.c -l %d" % self.line,
-#                    BREAKPOINT_CREATED,
-#            startstr = "Breakpoint created: 3: file ='main.c', line = %d, locations = 1" %
-#                        self.line)
 
         # Now add callbacks for the breakpoints just created.
         self.runCmd("breakpoint command add -s command -o 'frame variable -T -s' 1")

diff --git a/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py b/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
index 8291b2d..29ab2e9 100644 (file)
--- a/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
@@ -36,10 +36,6 @@ class CategoriesDataFormatterTestCase(TestBase):
         self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
 
         lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
-#        self.expect("breakpoint set -f main.cpp -l %d" % self.line,
-#                    BREAKPOINT_CREATED,
-#            startstr = "Breakpoint created: 1: file ='main.cpp', line = %d, locations = 1" %
-#                        self.line)
 
         self.runCmd("run", RUN_SUCCEEDED)
 

diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py b/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
index a013dd4..339e633 100644 (file)
--- a/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
+++ b/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
@@ -247,9 +247,6 @@ class WatchpointCommandsTestCase(TestBase):
 
         # Add a breakpoint to set a watchpoint when stopped on the breakpoint.
         lldbutil.run_break_set_by_file_and_line (self, "main.m")
-#        self.expect("breakpoint set -l %d" % self.line, BREAKPOINT_CREATED,
-#            startstr = "Breakpoint created: 1: file ='%s', line = %d, locations = 1" %
-#                       (self.source, self.line))#
 
         # Run the program.
         self.runCmd("run", RUN_SUCCEEDED)
@@ -305,9 +302,6 @@ class WatchpointCommandsTestCase(TestBase):
 
         # Add a breakpoint to set a watchpoint when stopped on the breakpoint.
         lldbutil.run_break_set_by_file_and_line (self, None, self.line, num_expected_locations=1)
-#        self.expect("breakpoint set -l %d" % self.line, BREAKPOINT_CREATED,
-#            startstr = "Breakpoint created: 1: file ='%s', line = %d, locations = 1" %
-#                       (self.source, self.line))
 
         # Run the program.
         self.runCmd("run", RUN_SUCCEEDED)
@@ -348,9 +342,6 @@ class WatchpointCommandsTestCase(TestBase):
 
         # Add a breakpoint to set a watchpoint when stopped on the breakpoint.
         lldbutil.run_break_set_by_file_and_line (self, None, self.line, num_expected_locations=1)
-#        self.expect("breakpoint set -l %d" % self.line, BREAKPOINT_CREATED,
-#            startstr = "Breakpoint created: 1: file ='%s', line = %d, locations = 1" %
-#                       (self.source, self.line))
 
         # Run the program.
         self.runCmd("run", RUN_SUCCEEDED)
@@ -395,9 +386,6 @@ class WatchpointCommandsTestCase(TestBase):
 
         # Add a breakpoint to set a watchpoint when stopped on the breakpoint.
         lldbutil.run_break_set_by_file_and_line (self, None, self.line, num_expected_locations=1)
-#        self.expect("breakpoint set -l %d" % self.line, BREAKPOINT_CREATED,
-#            startstr = "Breakpoint created: 1: file ='%s', line = %d, locations = 1" %
-#                       (self.source, self.line))#
 
         # Run the program.
         self.runCmd("run", RUN_SUCCEEDED)
@@ -452,13 +440,7 @@ class WatchpointCommandsTestCase(TestBase):
 
         # Add a breakpoint to set a watchpoint when stopped on the breakpoint.
         lldbutil.run_break_set_by_file_and_line (self, None, self.line, num_expected_locations=1)
-#        self.expect("breakpoint set -l %d" % self.line, BREAKPOINT_CREATED,
-#            startstr = "Breakpoint created: 1: file ='%s', line = %d, locations = 1" %
-#                       (self.source, self.line))
         lldbutil.run_break_set_by_file_and_line (self, None, self.line2, num_expected_locations=1)
-#        self.expect("breakpoint set -l %d" % self.line2, BREAKPOINT_CREATED,
-#            startstr = "Breakpoint created: 2: file ='%s', line = %d, locations = 1" %
-#                       (self.source, self.line2))
 
         # Run the program.
         self.runCmd("run", RUN_SUCCEEDED)

diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py b/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
index 57c4569..ecad010 100644 (file)
--- a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
+++ b/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
@@ -62,9 +62,6 @@ class WatchpointLLDBCommandTestCase(TestBase):
 
         # Add a breakpoint to set a watchpoint when stopped on the breakpoint.
         lldbutil.run_break_set_by_file_and_line (self, None, self.line, num_expected_locations=1)
-#        self.expect("breakpoint set -l %d" % self.line, BREAKPOINT_CREATED,
-#            startstr = "Breakpoint created: 1: file ='%s', line = %d, locations = 1" %
-#                       (self.source, self.line))
 
         # Run the program.
         self.runCmd("run", RUN_SUCCEEDED)
@@ -114,9 +111,6 @@ class WatchpointLLDBCommandTestCase(TestBase):
 
         # Add a breakpoint to set a watchpoint when stopped on the breakpoint.
         lldbutil.run_break_set_by_file_and_line (self, None, self.line, num_expected_locations=1)
-#        self.expect("breakpoint set -l %d" % self.line, BREAKPOINT_CREATED,
-#            startstr = "Breakpoint created: 1: file ='%s', line = %d, locations = 1" %
-#                       (self.source, self.line))#
 
         # Run the program.
         self.runCmd("run", RUN_SUCCEEDED)

diff --git a/lldb/test/lang/objc/foundation/TestFoundationDisassembly.py b/lldb/test/lang/objc/foundation/TestFoundationDisassembly.py
index 06ec47f..2975b3a 100644 (file)
--- a/lldb/test/lang/objc/foundation/TestFoundationDisassembly.py
+++ b/lldb/test/lang/objc/foundation/TestFoundationDisassembly.py
@@ -76,24 +76,16 @@ class FoundationDisassembleTestCase(TestBase):
         symbol_name = "+[NSString stringWithFormat:]"
         break_results = lldbutil.run_break_set_command (self, "_regexp-break %s"%(symbol_name))
         lldbutil.check_breakpoint_result (self, break_results, symbol_name=symbol_name, num_locations=1)
-#        self.expect("_regexp-break +[NSString stringWithFormat:]", BREAKPOINT_CREATED,
-#            substrs = ["Breakpoint created: 1: name = '+[NSString stringWithFormat:]', locations = 1"])
 
         # Stop at -[MyString initWithNSString:].
         lldbutil.run_break_set_by_symbol (self, '-[MyString initWithNSString:]', num_expected_locations=1, sym_exact=True)
-#        self.expect("breakpoint set -n '-[MyString initWithNSString:]'", BREAKPOINT_CREATED,
-#            startstr = "Breakpoint created: 2: name = '-[MyString initWithNSString:]', locations = 1")
 
         # Stop at the "description" selector.
         lldbutil.run_break_set_by_selector (self, 'description', num_expected_locations=1)
-#        self.expect("breakpoint set -S description", BREAKPOINT_CREATED,
-#            startstr = "Breakpoint created: 3: name = 'description', locations = 1")
 
         # Stop at -[NSAutoreleasePool release].
         break_results = lldbutil.run_break_set_command (self, "_regexp-break -[NSAutoreleasePool release]")
         lldbutil.check_breakpoint_result (self, break_results, symbol_name='-[NSAutoreleasePool release]', num_locations=1)
-#        self.expect("_regexp-break -[NSAutoreleasePool release]", BREAKPOINT_CREATED,
-#            substrs = ["Breakpoint created: 4: name = '-[NSAutoreleasePool release]', locations = 1"])
 
         self.runCmd("run", RUN_SUCCEEDED)
 

diff --git a/lldb/test/lang/objc/foundation/TestObjCMethods.py b/lldb/test/lang/objc/foundation/TestObjCMethods.py
index 9a4d26b..0896fc4 100644 (file)
--- a/lldb/test/lang/objc/foundation/TestObjCMethods.py
+++ b/lldb/test/lang/objc/foundation/TestObjCMethods.py
@@ -64,24 +64,16 @@ class FoundationTestCase(TestBase):
         # Stop at +[NSString stringWithFormat:].
         break_results = lldbutil.run_break_set_command(self, "_regexp-break +[NSString stringWithFormat:]")
         lldbutil.check_breakpoint_result (self, break_results, symbol_name='+[NSString stringWithFormat:]', num_locations=1)
-#        self.expect("_regexp-break +[NSString stringWithFormat:]", BREAKPOINT_CREATED,
-#            substrs = ["Breakpoint created: 1: name = '+[NSString stringWithFormat:]', locations = 1"])
 
         # Stop at -[MyString initWithNSString:].
         lldbutil.run_break_set_by_symbol (self, '-[MyString initWithNSString:]', num_expected_locations=1, sym_exact=True)
-#        self.expect("breakpoint set -n '-[MyString initWithNSString:]'", BREAKPOINT_CREATED,
-#            startstr = "Breakpoint created: 2: name = '-[MyString initWithNSString:]', locations = 1")
 
         # Stop at the "description" selector.
         lldbutil.run_break_set_by_selector (self, 'description', num_expected_locations=1)
-#        self.expect("breakpoint set -S description", BREAKPOINT_CREATED,
-#            startstr = "Breakpoint created: 3: name = 'description', locations = 1")
 
         # Stop at -[NSAutoreleasePool release].
         break_results = lldbutil.run_break_set_command(self, "_regexp-break -[NSAutoreleasePool release]")
         lldbutil.check_breakpoint_result (self, break_results, symbol_name='-[NSAutoreleasePool release]', num_locations=1)
-#        self.expect("_regexp-break -[NSAutoreleasePool release]", BREAKPOINT_CREATED,
-#            substrs = ["Breakpoint created: 4: name = '-[NSAutoreleasePool release]', locations = 1"])
 
         self.runCmd("run", RUN_SUCCEEDED)
 
@@ -204,10 +196,7 @@ class FoundationTestCase(TestBase):
 
         self.runCmd("breakpoint delete 1")
         lldbutil.run_break_set_by_file_and_line (self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
-#        self.expect("breakpoint set -f main.m -l %d" % self.line,
-#                    BREAKPOINT_CREATED,
-#            startstr = "Breakpoint created: 2: file ='main.m', line = %d, locations = 1" %
-#                        self.line)
+
         self.runCmd("process continue")
 
         # rdar://problem/8542091

diff --git a/lldb/test/lang/objc/foundation/TestObjCMethods2.py b/lldb/test/lang/objc/foundation/TestObjCMethods2.py
index 71b7bc9..861d9fc 100644 (file)
--- a/lldb/test/lang/objc/foundation/TestObjCMethods2.py
+++ b/lldb/test/lang/objc/foundation/TestObjCMethods2.py
@@ -106,9 +106,6 @@ class FoundationTestCase2(TestBase):
         # Create a bunch of breakpoints.
         for line in self.lines:
             lldbutil.run_break_set_by_file_and_line (self, "main.m", line, num_expected_locations=1, loc_exact=True)
-#            self.expect("breakpoint set -f main.m -l %d" % line, BREAKPOINT_CREATED,
-#                substrs = ["Breakpoint created:",
-#                           "file ='main.m', line = %d, locations = 1" % line])
 
         self.runCmd("run", RUN_SUCCEEDED)
 
@@ -146,9 +143,6 @@ class FoundationTestCase2(TestBase):
         # Break inside Test_NSArray:
         line = self.lines[1]
         lldbutil.run_break_set_by_file_and_line (self, "main.m", line, num_expected_locations=1, loc_exact=True)
-#        self.expect("breakpoint set -f main.m -l %d" % line, BREAKPOINT_CREATED,
-#            substrs = ["Breakpoint created:",
-#                       "file ='main.m', line = %d, locations = 1" % line])#
 
         self.runCmd("run", RUN_SUCCEEDED)
 
@@ -176,9 +170,6 @@ class FoundationTestCase2(TestBase):
         # Break inside Test_NSString:
         line = self.lines[2]
         lldbutil.run_break_set_by_file_and_line (self, "main.m", line, num_expected_locations=1, loc_exact=True)
-#        self.expect("breakpoint set -f main.m -l %d" % line, BREAKPOINT_CREATED,
-#            substrs = ["Breakpoint created:",
-#                       "file ='main.m', line = %d, locations = 1" % line])#
 
         self.runCmd("run", RUN_SUCCEEDED)
 
@@ -206,10 +197,7 @@ class FoundationTestCase2(TestBase):
         line = self.lines[4]
 
         lldbutil.run_break_set_by_file_and_line (self, "main.m", line, num_expected_locations=1, loc_exact=True)
-#        self.expect("breakpoint set -f main.m -l %d" % line, BREAKPOINT_CREATED,
-#                    substrs = ["Breakpoint created:",
-#                               "file ='main.m', line = %d, locations = 1" % line])
-#        
+
         self.runCmd("run", RUN_SUCCEEDED)
         
         self.expect("expression *my",
@@ -224,9 +212,6 @@ class FoundationTestCase2(TestBase):
         line = self.lines[4]
 
         lldbutil.run_break_set_by_file_and_line (self, "main.m", line, num_expected_locations=1, loc_exact=True)
-#        self.expect("breakpoint set -f main.m -l %d" % line, BREAKPOINT_CREATED,
-#                    substrs = ["Breakpoint created:",
-#                               "file ='main.m', line = %d, locations = 1" % line])#
 
         self.runCmd("run", RUN_SUCCEEDED)
 
@@ -242,9 +227,6 @@ class FoundationTestCase2(TestBase):
         line = self.lines[4]
 
         lldbutil.run_break_set_by_file_and_line (self, "main.m", line, num_expected_locations=1, loc_exact=True)
-#        self.expect("breakpoint set -f main.m -l %d" % line, BREAKPOINT_CREATED,
-#                    substrs = ["Breakpoint created:",
-#                               "file ='main.m', line = %d, locations = 1" % line])#
 
         self.runCmd("run", RUN_SUCCEEDED)