https://github.com/ashgti created
https://github.com/llvm/llvm-project/pull/116045
Previously this used `var` as both an lldb command and variable in the source
to validate the behavior of the 'auto' repl mode. However, `var` seems to
occasionally fail in the CI test when attempting to print some c++ types.
Instead switch the command and variable name to `list` which should not run the
dynamic variable formatting code for c++ objects.
This should fix #116041.
>From c0663c53f0fad4a0afb20ec93a05151c5a1ae37f Mon Sep 17 00:00:00 2001
From: John Harrison <harj...@google.com>
Date: Wed, 13 Nov 2024 08:24:38 -0500
Subject: [PATCH] [lldb-dap] Adjust the evaluate test to use a different lldb
command.
Previously this used `var` as both an lldb command and variable in the source
to validate the behavior of the 'auto' repl mode. However, `var` seems to
occasionally fail in the CI test when attempting to print some c++ types.
Instead switch the command and variable name to `list` which should not run the
dynamic variable formatting code for c++ objects.
---
.../API/tools/lldb-dap/evaluate/TestDAP_evaluate.py | 10 +++++-----
lldb/test/API/tools/lldb-dap/evaluate/main.cpp | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lldb/test/API/tools/lldb-dap/evaluate/TestDAP_evaluate.py
b/lldb/test/API/tools/lldb-dap/evaluate/TestDAP_evaluate.py
index 0126d40d86fca2..251d77d79d0800 100644
--- a/lldb/test/API/tools/lldb-dap/evaluate/TestDAP_evaluate.py
+++ b/lldb/test/API/tools/lldb-dap/evaluate/TestDAP_evaluate.py
@@ -101,9 +101,9 @@ def run_test_evaluate_expressions(
if context == "repl":
# In the repl context expressions may be interpreted as lldb
# commands since no variables have the same name as the command.
- self.assertEvaluate("var", r"\(lldb\) var\n.*")
+ self.assertEvaluate("list", r"\(lldb\) list\n.*")
else:
- self.assertEvaluateFailure("var") # local variable of a_function
+ self.assertEvaluateFailure("list") # local variable of a_function
self.assertEvaluateFailure("my_struct") # type name
self.assertEvaluateFailure("int") # type name
@@ -162,7 +162,7 @@ def run_test_evaluate_expressions(
# Expressions at breakpoint 3, which is inside a_function
self.continue_to_next_stop()
- self.assertEvaluate("var", "42")
+ self.assertEvaluate("list", "42")
self.assertEvaluate("static_int", "42")
self.assertEvaluate("non_static_int", "43")
@@ -176,13 +176,13 @@ def run_test_evaluate_expressions(
if self.isExpressionParsedExpected():
self.assertEvaluate("a_function", "0x.*a.out`a_function.*")
self.assertEvaluate("a_function(1)", "1")
- self.assertEvaluate("var + 1", "43")
+ self.assertEvaluate("list + 1", "43")
self.assertEvaluate("foo_func", "0x.*a.out`foo_func.*")
self.assertEvaluate("foo_var", "44")
else:
self.assertEvaluateFailure("a_function")
self.assertEvaluateFailure("a_function(1)")
- self.assertEvaluateFailure("var + 1")
+ self.assertEvaluateFailure("list + 1")
self.assertEvaluateFailure("foo_func")
self.assertEvaluateFailure("foo_var")
diff --git a/lldb/test/API/tools/lldb-dap/evaluate/main.cpp
b/lldb/test/API/tools/lldb-dap/evaluate/main.cpp
index 1c68716e3a6e11..1c3d258114b1ff 100644
--- a/lldb/test/API/tools/lldb-dap/evaluate/main.cpp
+++ b/lldb/test/API/tools/lldb-dap/evaluate/main.cpp
@@ -8,8 +8,8 @@ static int static_int = 42;
int non_static_int = 43;
-int a_function(int var) {
- return var; // breakpoint 3
+int a_function(int list) {
+ return list; // breakpoint 3
}
struct my_struct {
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
