This revision was automatically updated to reflect the committed changes. Closed by commit rG5f0c3bad2f03: Fix TestFormatters.py stepping too far (authored by rovka). Herald added a project: LLDB.
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D70303/new/ https://reviews.llvm.org/D70303 Files: lldb/packages/Python/lldbsuite/test/commands/expression/formatters/TestFormatters.py lldb/packages/Python/lldbsuite/test/commands/expression/formatters/main.cpp Index: lldb/packages/Python/lldbsuite/test/commands/expression/formatters/main.cpp =================================================================== --- lldb/packages/Python/lldbsuite/test/commands/expression/formatters/main.cpp +++ lldb/packages/Python/lldbsuite/test/commands/expression/formatters/main.cpp @@ -42,7 +42,7 @@ foo1.b.i = 9999; int numbers[5] = {1,2,3,4,5}; - - return 0; - + + return 0; // Done initializing + } Index: lldb/packages/Python/lldbsuite/test/commands/expression/formatters/TestFormatters.py =================================================================== --- lldb/packages/Python/lldbsuite/test/commands/expression/formatters/TestFormatters.py +++ lldb/packages/Python/lldbsuite/test/commands/expression/formatters/TestFormatters.py @@ -231,9 +231,8 @@ 0) == 122, '*a_ptr = 122') - self.runCmd("n") - self.runCmd("n") - self.runCmd("n") + ret = line_number("main.cpp", "Done initializing") + self.runCmd("thread until " + str(ret)) self.expect("frame variable numbers", substrs=['1', '2', '3', '4', '5'])
Index: lldb/packages/Python/lldbsuite/test/commands/expression/formatters/main.cpp =================================================================== --- lldb/packages/Python/lldbsuite/test/commands/expression/formatters/main.cpp +++ lldb/packages/Python/lldbsuite/test/commands/expression/formatters/main.cpp @@ -42,7 +42,7 @@ foo1.b.i = 9999; int numbers[5] = {1,2,3,4,5}; - - return 0; - + + return 0; // Done initializing + } Index: lldb/packages/Python/lldbsuite/test/commands/expression/formatters/TestFormatters.py =================================================================== --- lldb/packages/Python/lldbsuite/test/commands/expression/formatters/TestFormatters.py +++ lldb/packages/Python/lldbsuite/test/commands/expression/formatters/TestFormatters.py @@ -231,9 +231,8 @@ 0) == 122, '*a_ptr = 122') - self.runCmd("n") - self.runCmd("n") - self.runCmd("n") + ret = line_number("main.cpp", "Done initializing") + self.runCmd("thread until " + str(ret)) self.expect("frame variable numbers", substrs=['1', '2', '3', '4', '5'])
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits