Michael137 created this revision. Michael137 added reviewers: aprantl, fdeazeve. Herald added a project: All. Michael137 requested review of this revision. Herald added a project: LLDB. Herald added a subscriber: lldb-commits.
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. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D134727 Files: lldb/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py Index: lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py =================================================================== --- lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py +++ lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py @@ -10,7 +10,6 @@ class TestBasicVector(TestBase): @add_test_categories(["libc++"]) - @expectedFailureDarwin # FIXME: May need to force system libcxx here. @skipIf(compiler=no_match("clang")) def test(self): self.build() @@ -29,7 +28,7 @@ iterator_children = [ValueCheck(name="item")] riterator = "reverse_iterator" riterator_children = [ - ValueCheck(name="__t"), + ValueCheck(), # Deprecated __t_ member; no need to check ValueCheck(name="current") ] Index: lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py =================================================================== --- lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py +++ lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py @@ -11,7 +11,6 @@ class TestDbgInfoContentVector(TestBase): @add_test_categories(["libc++"]) - @expectedFailureDarwin # FIXME: May need to force system libcxx here. @skipIf(compiler=no_match("clang")) def test(self): self.build() @@ -30,7 +29,7 @@ iterator_children = [ValueCheck(name="item")] riterator = "reverse_iterator" riterator_children = [ - ValueCheck(name="__t"), + ValueCheck(), # Deprecated __t_ member; no need to check ValueCheck(name="current") ] Index: lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py =================================================================== --- lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py +++ lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py @@ -10,7 +10,6 @@ class TestDbgInfoContentDeque(TestBase): @add_test_categories(["libc++"]) - @expectedFailureDarwin # FIXME: May need to force system libcxx here. @skipIf(compiler=no_match("clang")) def test(self): self.build() @@ -33,7 +32,7 @@ riterator_type = "reverse_iterator" riterator_children = [ - ValueCheck(name="__t"), + ValueCheck(), # Deprecated __t_ member; no need to check ValueCheck(name="current") ] Index: lldb/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py =================================================================== --- lldb/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py +++ lldb/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py @@ -10,7 +10,6 @@ class TestBasicDeque(TestBase): @add_test_categories(["libc++"]) - @expectedFailureDarwin # FIXME: May need to force system libcxx here. @skipIf(compiler=no_match("clang")) def test(self): self.build() @@ -31,7 +30,7 @@ ] riterator = "reverse_iterator" riterator_children = [ - ValueCheck(name="__t"), + ValueCheck(), # Deprecated __t_ member; no need to check ValueCheck(name="current") ]
Index: lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py =================================================================== --- lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py +++ lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py @@ -10,7 +10,6 @@ class TestBasicVector(TestBase): @add_test_categories(["libc++"]) - @expectedFailureDarwin # FIXME: May need to force system libcxx here. @skipIf(compiler=no_match("clang")) def test(self): self.build() @@ -29,7 +28,7 @@ iterator_children = [ValueCheck(name="item")] riterator = "reverse_iterator" riterator_children = [ - ValueCheck(name="__t"), + ValueCheck(), # Deprecated __t_ member; no need to check ValueCheck(name="current") ] Index: lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py =================================================================== --- lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py +++ lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py @@ -11,7 +11,6 @@ class TestDbgInfoContentVector(TestBase): @add_test_categories(["libc++"]) - @expectedFailureDarwin # FIXME: May need to force system libcxx here. @skipIf(compiler=no_match("clang")) def test(self): self.build() @@ -30,7 +29,7 @@ iterator_children = [ValueCheck(name="item")] riterator = "reverse_iterator" riterator_children = [ - ValueCheck(name="__t"), + ValueCheck(), # Deprecated __t_ member; no need to check ValueCheck(name="current") ] Index: lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py =================================================================== --- lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py +++ lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py @@ -10,7 +10,6 @@ class TestDbgInfoContentDeque(TestBase): @add_test_categories(["libc++"]) - @expectedFailureDarwin # FIXME: May need to force system libcxx here. @skipIf(compiler=no_match("clang")) def test(self): self.build() @@ -33,7 +32,7 @@ riterator_type = "reverse_iterator" riterator_children = [ - ValueCheck(name="__t"), + ValueCheck(), # Deprecated __t_ member; no need to check ValueCheck(name="current") ] Index: lldb/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py =================================================================== --- lldb/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py +++ lldb/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py @@ -10,7 +10,6 @@ class TestBasicDeque(TestBase): @add_test_categories(["libc++"]) - @expectedFailureDarwin # FIXME: May need to force system libcxx here. @skipIf(compiler=no_match("clang")) def test(self): self.build() @@ -31,7 +30,7 @@ ] riterator = "reverse_iterator" riterator_children = [ - ValueCheck(name="__t"), + ValueCheck(), # Deprecated __t_ member; no need to check ValueCheck(name="current") ]
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits