Fix all the test case breakages caused by folks writing tests all over the place that depended explicitly

on the output of "break set".  Please don't do this sort of thing!!!!!

llvm-svn: 164433

1 files changed, 4 insertions, 8 deletions

diff --git a/lldb/test/functionalities/stop-hook/TestStopHookCmd.py b/lldb/test/functionalities/stop-hook/TestStopHookCmd.py
index 7bb32253db3..8ef3bf50a81 100644
--- a/lldb/test/functionalities/stop-hook/TestStopHookCmd.py
+++ b/lldb/test/functionalities/stop-hook/TestStopHookCmd.py
@@ -7,6 +7,7 @@ import unittest2
 import StringIO
 import lldb
 from lldbtest import *
+import lldbutil
 
 class StopHookCmdTestCase(TestBase):
 
@@ -43,14 +44,9 @@ class StopHookCmdTestCase(TestBase):
         exe = os.path.join(os.getcwd(), "a.out")
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
 
-        self.expect('breakpoint set -f main.cpp -l %d' % self.begl,
-                    BREAKPOINT_CREATED,
-            startstr = "Breakpoint created: 1: file ='main.cpp', line = %d" %
-                        self.begl)
-        self.expect('breakpoint set -f main.cpp -l %d' % self.line,
-                    BREAKPOINT_CREATED,
-            startstr = "Breakpoint created: 2: file ='main.cpp', line = %d" %
-                        self.line)
+        lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.begl, num_expected_locations=1, loc_exact=True)
+
+        lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
 
         self.runCmd("target stop-hook add -f main.cpp -l %d -e %d -o 'expr ptr'" % (self.begl, self.endl))