================
@@ -312,17 +341,91 @@ def run_test_evaluate_expressions(
# Now we check that values are updated after stepping
self.continue_to_breakpoint(breakpoint_4)
- self.assertEvaluate("my_vec", "size=2", want_varref=True)
+ if self.isResultExpandedDescription():
+ self.assertEvaluate(
+ "my_vec",
+ r"\(std::vector<int>\) \$\d+ = size=2 {\n \[0\] = 1\n \[1\]
= 2\n}",
+ want_varref=True,
+ )
+ elif self.isResultShortDescription():
+ self.assertEvaluate(
+ "my_vec", r"size=2 {\n \[0\] = 1\n \[1\] = 2\n}",
want_varref=True
+ )
+ else:
+ self.assertEvaluate("my_vec", "size=2", want_varref=True)
self.continue_to_breakpoint(breakpoint_5)
- self.assertEvaluate("my_vec", "size=3", want_varref=True)
+ if self.isResultExpandedDescription():
+ self.assertEvaluate(
+ "my_vec",
+ r"\(std::vector<int>\) \$\d+ = size=3 {\n \[0\] = 1\n \[1\]
= 2\n \[2\] = 3\n}",
+ want_varref=True,
+ )
+ elif self.isResultShortDescription():
+ self.assertEvaluate(
+ "my_vec",
+ r"size=3 {\n \[0\] = 1\n \[1\] = 2\n \[2\] = 3\n}",
+ want_varref=True,
+ )
+ else:
+ self.assertEvaluate("my_vec", "size=3", want_varref=True)
- self.assertEvaluate("my_map", "size=2", want_varref=True)
+ if self.isResultExpandedDescription():
+ self.assertEvaluate(
+ "my_map",
+ r"\(std::map<int, int>\) \$\d+ = size=2 {\n \[0\] = \(first =
1, second = 2\)\n \[1\] = \(first = 2, second = 3\)\n}",
+ want_varref=True,
+ )
+ elif self.isResultShortDescription():
+ self.assertEvaluate(
----------------
DrSergei wrote:
I removed test for `std::map`, but all of evelaute request tests are disabled
on Windows
https://github.com/llvm/llvm-project/pull/170644
_______________________________________________
lldb-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
