Skip to content

Commit 6606d97

Browse files
committed
[lldb][test] Adjust import-std-module shared_ptr/weak_ptr tests
The formatters for these have been reworked in recent patches. (cherry picked from commit 912ab52)
1 parent 870e4cc commit 6606d97

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

lldb/test/API/commands/expression/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContentFromStdModule.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def test(self):
2323
self.expect_expr(
2424
"s",
2525
result_type="std::shared_ptr<Foo>",
26-
result_children=[ValueCheck(name="__ptr_")],
26+
result_children=[ValueCheck(name="pointer")],
2727
)
2828
self.expect_expr("s->a", result_type="int", result_value="3")
2929
self.expect_expr("s->a = 5", result_type="int", result_value="5")

lldb/test/API/commands/expression/import-std-module/shared_ptr/TestSharedPtrFromStdModule.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
class TestSharedPtr(TestBase):
1212
@add_test_categories(["libc++"])
1313
@skipIf(compiler=no_match("clang"))
14+
@skipUnlessDarwin
1415
def test(self):
1516
self.build()
1617

@@ -23,8 +24,8 @@ def test(self):
2324
self.expect_expr(
2425
"s",
2526
result_type="std::shared_ptr<int>",
26-
result_summary="3 strong=1 weak=1",
27-
result_children=[ValueCheck(name="__ptr_")],
27+
result_summary="3 strong=1 weak=0",
28+
result_children=[ValueCheck(name="pointer")],
2829
)
2930
self.expect_expr("*s", result_type="int", result_value="3")
3031
self.expect_expr("*s = 5", result_type="int", result_value="5")

lldb/test/API/commands/expression/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtrFromStdModule.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
class TestDbgInfoContentWeakPtr(TestBase):
1212
@add_test_categories(["libc++"])
1313
@skipIf(compiler=no_match("clang"))
14+
@skipUnlessDarwin
1415
def test(self):
1516
self.build()
1617

@@ -23,7 +24,7 @@ def test(self):
2324
self.expect_expr(
2425
"w",
2526
result_type="std::weak_ptr<Foo>",
26-
result_children=[ValueCheck(name="__ptr_")],
27+
result_children=[ValueCheck(name="pointer")],
2728
)
2829
self.expect_expr("*w.lock()", result_type="Foo")
2930
self.expect_expr("w.lock()->a", result_type="int", result_value="3")

lldb/test/API/commands/expression/import-std-module/weak_ptr/TestWeakPtrFromStdModule.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
class TestSharedPtr(TestBase):
1212
@add_test_categories(["libc++"])
1313
@skipIf(compiler=no_match("clang"))
14+
@skipUnlessDarwin
1415
def test(self):
1516
self.build()
1617

@@ -23,8 +24,8 @@ def test(self):
2324
self.expect_expr(
2425
"w",
2526
result_type="std::weak_ptr<int>",
26-
result_summary="3 strong=1 weak=2",
27-
result_children=[ValueCheck(name="__ptr_")],
27+
result_summary="3 strong=1 weak=1",
28+
result_children=[ValueCheck(name="pointer")],
2829
)
2930
self.expect_expr("*w.lock()", result_type="int", result_value="3")
3031
self.expect_expr("*w.lock() = 5", result_type="int", result_value="5")

0 commit comments

Comments
 (0)