From 2051222d2beede3a5bed8a9436dce3ca217d53a6 Mon Sep 17 00:00:00 2001
From: Ebuka Ezike <yerimyah1@gmail.com>
Date: Thu, 29 May 2025 21:28:13 +0100
Subject: [PATCH 1/3] [lldb][lldb-dap][test] show the expected value in the
 error message.

show the expected value in the error message so we can see the expected
value without searching through the log messages.
---
 .../test/API/tools/lldb-dap/optimized/TestDAP_optimized.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lldb/test/API/tools/lldb-dap/optimized/TestDAP_optimized.py b/lldb/test/API/tools/lldb-dap/optimized/TestDAP_optimized.py
index ae144ebdca46b..ba6da9469c204 100644
--- a/lldb/test/API/tools/lldb-dap/optimized/TestDAP_optimized.py
+++ b/lldb/test/API/tools/lldb-dap/optimized/TestDAP_optimized.py
@@ -45,9 +45,14 @@ def test_optimized_variable(self):
         self.continue_to_breakpoints(breakpoint_ids)
         optimized_variable = self.dap_server.get_local_variable("argc")
 
-        self.assertTrue(optimized_variable["value"].startswith("<error:"))
+        expected_value: str = optimized_variable["value"]
+        self.assertTrue(
+            expected_value.startswith("<error:"),
+            f"expect error for value: '{expected_value}'",
+        )
         error_msg = optimized_variable["$__lldb_extensions"]["error"]
         self.assertTrue(
             ("could not evaluate DW_OP_entry_value: no parent function" in error_msg)
             or ("variable not available" in error_msg)
         )
+        self.continue_to_exit()

From 3d003e0ed6a8b909adc9e27fc8613a9731a295ca Mon Sep 17 00:00:00 2001
From: Ebuka Ezike <yerimyah1@gmail.com>
Date: Thu, 29 May 2025 22:48:40 +0100
Subject: [PATCH 2/3] Update
 lldb/test/API/tools/lldb-dap/optimized/TestDAP_optimized.py

Co-authored-by: Jonas Devlieghere <jonas@devlieghere.com>
---
 lldb/test/API/tools/lldb-dap/optimized/TestDAP_optimized.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lldb/test/API/tools/lldb-dap/optimized/TestDAP_optimized.py b/lldb/test/API/tools/lldb-dap/optimized/TestDAP_optimized.py
index ba6da9469c204..f6cf45b54e2a9 100644
--- a/lldb/test/API/tools/lldb-dap/optimized/TestDAP_optimized.py
+++ b/lldb/test/API/tools/lldb-dap/optimized/TestDAP_optimized.py
@@ -45,9 +45,9 @@ def test_optimized_variable(self):
         self.continue_to_breakpoints(breakpoint_ids)
         optimized_variable = self.dap_server.get_local_variable("argc")
 
-        expected_value: str = optimized_variable["value"]
+        value: str = optimized_variable["value"]
         self.assertTrue(
-            expected_value.startswith("<error:"),
+            value.startswith("<error:"),
             f"expect error for value: '{expected_value}'",
         )
         error_msg = optimized_variable["$__lldb_extensions"]["error"]

From 76839fb6833461393dffe4c22354bcd69c284e14 Mon Sep 17 00:00:00 2001
From: Ebuka Ezike <yerimyah1@gmail.com>
Date: Thu, 29 May 2025 23:15:01 +0100
Subject: [PATCH 3/3] [lldb-dap] missed change

---
 lldb/test/API/tools/lldb-dap/optimized/TestDAP_optimized.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lldb/test/API/tools/lldb-dap/optimized/TestDAP_optimized.py b/lldb/test/API/tools/lldb-dap/optimized/TestDAP_optimized.py
index f6cf45b54e2a9..9cfa9b20f6051 100644
--- a/lldb/test/API/tools/lldb-dap/optimized/TestDAP_optimized.py
+++ b/lldb/test/API/tools/lldb-dap/optimized/TestDAP_optimized.py
@@ -48,7 +48,7 @@ def test_optimized_variable(self):
         value: str = optimized_variable["value"]
         self.assertTrue(
             value.startswith("<error:"),
-            f"expect error for value: '{expected_value}'",
+            f"expect error for value: '{value}'",
         )
         error_msg = optimized_variable["$__lldb_extensions"]["error"]
         self.assertTrue(