[Lldb-commits] [lldb] 912ab52 - [lldb][test] Adjust import-std-module shared_ptr/weak_ptr tests

[Michael Buch via lldb-commits]

Author: Michael Buch
Date: 2025-07-07T11:22:55+01:00
New Revision: 912ab5241379b4dd525080cd9a3e468d6779340c

URL: https://github.com/llvm/llvm-project/commit/912ab5241379b4dd525080cd9a3e468d6779340c
DIFF: https://github.com/llvm/llvm-project/commit/912ab5241379b4dd525080cd9a3e468d6779340c.diff

LOG: [lldb][test] Adjust import-std-module shared_ptr/weak_ptr tests

The formatters for these have been reworked in recent patches.

Added: 
    

Modified: 
    lldb/test/API/commands/expression/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContentFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/shared_ptr/TestSharedPtrFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtrFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/weak_ptr/TestWeakPtrFromStdModule.py

Removed: 
    


################################################################################
diff  --git a/lldb/test/API/commands/expression/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContentFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContentFromStdModule.py
index 168c4994b39ba..85755a62018c0 100644
--- a/lldb/test/API/commands/expression/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContentFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContentFromStdModule.py
@@ -23,7 +23,7 @@ def test(self):
         self.expect_expr(
             "s",
             result_type="std::shared_ptr<Foo>",
-            result_children=[ValueCheck(name="__ptr_")],
+            result_children=[ValueCheck(name="pointer")],
         )
         self.expect_expr("s->a", result_type="int", result_value="3")
         self.expect_expr("s->a = 5", result_type="int", result_value="5")

diff  --git a/lldb/test/API/commands/expression/import-std-module/shared_ptr/TestSharedPtrFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/shared_ptr/TestSharedPtrFromStdModule.py
index 1704099cfd85a..35d62ae50f6a8 100644
--- a/lldb/test/API/commands/expression/import-std-module/shared_ptr/TestSharedPtrFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/shared_ptr/TestSharedPtrFromStdModule.py
@@ -10,7 +10,7 @@
 class TestSharedPtr(TestBase):
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
-    @skipIf(compiler="clang", compiler_version=['<', '17.0'])
+    @skipIf(compiler="clang", compiler_version=["<", "17.0"])
     @skipUnlessDarwin
     def test(self):
         self.build()
@@ -24,8 +24,8 @@ def test(self):
         self.expect_expr(
             "s",
             result_type="std::shared_ptr<int>",
-            result_summary="3 strong=1 weak=1",
-            result_children=[ValueCheck(name="__ptr_")],
+            result_summary="3 strong=1 weak=0",
+            result_children=[ValueCheck(name="pointer")],
         )
         self.expect_expr("*s", result_type="element_type", result_value="3")
         self.expect_expr("*s = 5", result_type="element_type", result_value="5")

diff  --git a/lldb/test/API/commands/expression/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtrFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtrFromStdModule.py
index f07b0633d32ad..e95214df3b38c 100644
--- a/lldb/test/API/commands/expression/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtrFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtrFromStdModule.py
@@ -10,7 +10,7 @@
 class TestDbgInfoContentWeakPtr(TestBase):
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
-    @skipIf(compiler="clang", compiler_version=['<', '17.0'])
+    @skipIf(compiler="clang", compiler_version=["<", "17.0"])
     @skipUnlessDarwin
     def test(self):
         self.build()
@@ -24,7 +24,7 @@ def test(self):
         self.expect_expr(
             "w",
             result_type="std::weak_ptr<Foo>",
-            result_children=[ValueCheck(name="__ptr_")],
+            result_children=[ValueCheck(name="pointer")],
         )
         self.expect_expr("*w.lock()", result_type="element_type")
         self.expect_expr("w.lock()->a", result_type="int", result_value="3")

diff  --git a/lldb/test/API/commands/expression/import-std-module/weak_ptr/TestWeakPtrFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/weak_ptr/TestWeakPtrFromStdModule.py
index a9c53548a93c8..0bc0fd466acd5 100644
--- a/lldb/test/API/commands/expression/import-std-module/weak_ptr/TestWeakPtrFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/weak_ptr/TestWeakPtrFromStdModule.py
@@ -10,7 +10,7 @@
 class TestSharedPtr(TestBase):
     @add_test_categories(["libc++"])
     @skipIf(compiler=no_match("clang"))
-    @skipIf(compiler="clang", compiler_version=['<', '17.0'])
+    @skipIf(compiler="clang", compiler_version=["<", "17.0"])
     @skipUnlessDarwin
     def test(self):
         self.build()
@@ -24,8 +24,8 @@ def test(self):
         self.expect_expr(
             "w",
             result_type="std::weak_ptr<int>",
-            result_summary="3 strong=1 weak=2",
-            result_children=[ValueCheck(name="__ptr_")],
+            result_summary="3 strong=1 weak=1",
+            result_children=[ValueCheck(name="pointer")],
         )
         self.expect_expr("*w.lock()", result_type="element_type", result_value="3")
         self.expect_expr("*w.lock() = 5", result_type="element_type", result_value="5")