Skip to content

Commit d689570

Browse files
committed
[lldb] Make TestGuiBasicDebug more lenient
Matt's change to the register allocator in 89baeae changed where we end up after the `finish`. Before we'd end up on line 4. * thread #1, queue = 'com.apple.main-thread', stop reason = step out Return value: (int) $0 = 1 frame #0: 0x0000000100003f7d a.out`main(argc=1, argv=0x00007ffeefbff630) at main.c:4:3 1 extern int func(); 2 3 int main(int argc, char **argv) { -> 4 func(); // Break here 5 func(); // Second 6 return 0; 7 } Now, we end up on line 5. * thread #1, queue = 'com.apple.main-thread', stop reason = step out Return value: (int) $0 = 1 frame #0: 0x0000000100003f8d a.out`main(argc=1, argv=0x00007ffeefbff630) at main.c:5:3 2 3 int main(int argc, char **argv) { 4 func(); // Break here -> 5 func(); // Second 6 return 0; 7 } Given that this is not expected stable to be stable I've made the test a bit more lenient to accept both scenarios.
1 parent bc43ddf commit d689570

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ def test_gui(self):
3737
self.child.send("d") # down
3838
self.child.expect_exact("return 1; // In function")
3939
self.child.send("f") # finish
40-
self.child.expect("func\(\); // Break here[^\r\n]+<<< Thread 1: step out")
40+
self.child.expect("<<< Thread 1: step out")
4141
self.child.send("s") # move onto the second one
42-
self.child.expect("func\(\); // Second[^\r\n]+<<< Thread 1: step in")
42+
self.child.expect("<<< Thread 1: step in")
4343
self.child.send("n") # step over
44-
self.child.expect("return 0;[^\r\n]+<<< Thread 1: step over")
44+
self.child.expect("<<< Thread 1: step over")
4545

4646
# Press escape to quit the gui
4747
self.child.send(escape_key)

0 commit comments

Comments
 (0)