[Lldb-commits] [lldb] d689570 - [lldb] Make TestGuiBasicDebug more lenient

[Jonas Devlieghere via lldb-commits]

Author: Jonas Devlieghere
Date: 2020-09-30T17:06:47-07:00
New Revision: d689570d7dcb16ee241676e22324dc456837eb23

URL: https://github.com/llvm/llvm-project/commit/d689570d7dcb16ee241676e22324dc456837eb23
DIFF: https://github.com/llvm/llvm-project/commit/d689570d7dcb16ee241676e22324dc456837eb23.diff

LOG: [lldb] Make TestGuiBasicDebug more lenient

Matt's change to the register allocator in 89baeaef2fa9 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.

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py b/lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py
index ed5daf57a4441..81067bf776e39 100644
--- a/lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py
+++ b/lldb/test/API/commands/gui/basicdebug/TestGuiBasicDebug.py
@@ -37,11 +37,11 @@ def test_gui(self):
         self.child.send("d") # down
         self.child.expect_exact("return 1; // In function")
         self.child.send("f") # finish
-        self.child.expect("func\(\); // Break here[^\r\n]+<<< Thread 1: step out")
+        self.child.expect("<<< Thread 1: step out")
         self.child.send("s") # move onto the second one
-        self.child.expect("func\(\); // Second[^\r\n]+<<< Thread 1: step in")
+        self.child.expect("<<< Thread 1: step in")
         self.child.send("n") # step over
-        self.child.expect("return 0;[^\r\n]+<<< Thread 1: step over")
+        self.child.expect("<<< Thread 1: step over")
 
         # Press escape to quit the gui
         self.child.send(escape_key)