[Lldb-commits] [PATCH] D70303: Fix TestFormatters.py stepping too far

[Diana Picus via Phabricator via lldb-commits]

rovka updated this revision to Diff 229505.
rovka added a comment.

Addressed @labath's comment (test run in progress). Thanks for having a look!


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'])


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D70303.229505.patch
Type: text/x-patch
Size: 1150 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20191115/6c8f801a/attachment-0001.bin>