[Lldb-commits] [lldb] r257235 - Fiddling with Pavel's fix for getting the breakpoint right when there's debug info for sleep.

[Jim Ingham via lldb-commits]

Author: jingham
Date: Fri Jan  8 18:08:16 2016
New Revision: 257235

URL: http://llvm.org/viewvc/llvm-project?rev=257235&view=rev
Log:
Fiddling with Pavel's fix for getting the breakpoint right when there's debug info for sleep.

I prefer to use "-p" over using line_number and then setting by line because it's makes it possible
to see what the breakpoint is at the site where you make the breakpoint.  So I switched
it back to -p but specified the source file as well, which is an "all within lldb" way of doing
what Pavel's fix did.

Modified:
    lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py

Modified: lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py?rev=257235&r1=257234&r2=257235&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py Fri Jan  8 18:08:16 2016
@@ -19,7 +19,6 @@ class DriverBatchModeTest (TestBase):
         TestBase.setUp(self)
         # Our simple source filename.
         self.source = 'main.c'
-        self.line = line_number(self.source, 'Stop here to unset keep_waiting')
         self.victim = None
 
     def expect_string (self, string):
@@ -142,7 +141,7 @@ class DriverBatchModeTest (TestBase):
         
         self.victim.expect("Waiting")
 
-        run_commands = ' -b -o "process attach -p %d" -o "breakpoint set --file %s --line %d -N keep_waiting" -o "continue" -o "break delete keep_waiting" -o "expr keep_waiting = 0" -o "continue" ' % (victim_pid, self.source, self.line)
+        run_commands = ' -b -o "process attach -p %d" -o "breakpoint set --file %s -p \'Stop here to unset keep_waiting\' -N keep_waiting" -o "continue" -o "break delete keep_waiting" -o "expr keep_waiting = 0" -o "continue" ' % (victim_pid, self.source)
         self.child = pexpect.spawn('%s %s %s %s' % (lldbtest_config.lldbExec, self.lldbOption, run_commands, exe))
 
         child = self.child