Skip to content

Commit 7ccfaec

Browse files
committed
[lldb][test] Remove failing ValueCheck on deprecated libcxx entity
A recent libcxx change renamed all internal variables starting with `__`. As such, `std::reverse_iterator::__t` was renamed to `std::reverse_iterator::__t_`. This breaks the `import-std-module` tests with newer libcxx versions. Since this variable is deprecated in libcxx anyway, this patch simply removes the explicit `ValueCheck` on the variable name. We don't lose any interesting test-case here since the purpose of the test is to see if we can call functions from the `std` module. We can now re-enable the tests on Darwin for all buildbot Clang compiler variants. Differential Revision: https://reviews.llvm.org/D134727
1 parent c97e5ad commit 7ccfaec

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

lldb/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
class TestBasicDeque(TestBase):
1111

1212
@add_test_categories(["libc++"])
13-
@expectedFailureDarwin # FIXME: May need to force system libcxx here.
1413
@skipIf(compiler=no_match("clang"))
1514
def test(self):
1615
self.build()
@@ -31,7 +30,7 @@ def test(self):
3130
]
3231
riterator = "reverse_iterator"
3332
riterator_children = [
34-
ValueCheck(name="__t"),
33+
ValueCheck(), # Deprecated __t_ member; no need to check
3534
ValueCheck(name="current")
3635
]
3736

lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
class TestDbgInfoContentDeque(TestBase):
1111

1212
@add_test_categories(["libc++"])
13-
@expectedFailureDarwin # FIXME: May need to force system libcxx here.
1413
@skipIf(compiler=no_match("clang"))
1514
def test(self):
1615
self.build()
@@ -33,7 +32,7 @@ def test(self):
3332

3433
riterator_type = "reverse_iterator"
3534
riterator_children = [
36-
ValueCheck(name="__t"),
35+
ValueCheck(), # Deprecated __t_ member; no need to check
3736
ValueCheck(name="current")
3837
]
3938

lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
class TestDbgInfoContentVector(TestBase):
1212

1313
@add_test_categories(["libc++"])
14-
@expectedFailureDarwin # FIXME: May need to force system libcxx here.
1514
@skipIf(compiler=no_match("clang"))
1615
def test(self):
1716
self.build()
@@ -30,7 +29,7 @@ def test(self):
3029
iterator_children = [ValueCheck(name="item")]
3130
riterator = "reverse_iterator"
3231
riterator_children = [
33-
ValueCheck(name="__t"),
32+
ValueCheck(), # Deprecated __t_ member; no need to check
3433
ValueCheck(name="current")
3534
]
3635

lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
class TestBasicVector(TestBase):
1111

1212
@add_test_categories(["libc++"])
13-
@expectedFailureDarwin # FIXME: May need to force system libcxx here.
1413
@skipIf(compiler=no_match("clang"))
1514
def test(self):
1615
self.build()
@@ -29,7 +28,7 @@ def test(self):
2928
iterator_children = [ValueCheck(name="item")]
3029
riterator = "reverse_iterator"
3130
riterator_children = [
32-
ValueCheck(name="__t"),
31+
ValueCheck(), # Deprecated __t_ member; no need to check
3332
ValueCheck(name="current")
3433
]
3534

0 commit comments

Comments
 (0)