Author: Michael Buch Date: 2022-09-27T14:11:02+01:00 New Revision: 7ccfaecba6b1aa80eea1903b2c5ee20d4f00374c
URL: https://github.com/llvm/llvm-project/commit/7ccfaecba6b1aa80eea1903b2c5ee20d4f00374c DIFF: https://github.com/llvm/llvm-project/commit/7ccfaecba6b1aa80eea1903b2c5ee20d4f00374c.diff LOG: [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 Added: Modified: 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 Removed: ################################################################################ diff --git a/lldb/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py index 5f397ab1218b9..f77ba0d2417a4 100644 --- a/lldb/test/API/commands/expression/import-std-module/deque-basic/TestDequeFromStdModule.py +++ b/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 @@ def test(self): ] riterator = "reverse_iterator" riterator_children = [ - ValueCheck(name="__t"), + ValueCheck(), # Deprecated __t_ member; no need to check ValueCheck(name="current") ] diff --git a/lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py index 8b98a527c6012..d375e06c7964c 100644 --- a/lldb/test/API/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDequeFromStdModule.py +++ b/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 @@ def test(self): riterator_type = "reverse_iterator" riterator_children = [ - ValueCheck(name="__t"), + ValueCheck(), # Deprecated __t_ member; no need to check ValueCheck(name="current") ] diff --git a/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py index 8d0e926081661..7da615c3084d5 100644 --- a/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py +++ b/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 @@ def test(self): iterator_children = [ValueCheck(name="item")] riterator = "reverse_iterator" riterator_children = [ - ValueCheck(name="__t"), + ValueCheck(), # Deprecated __t_ member; no need to check ValueCheck(name="current") ] diff --git a/lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py index 44bee3df614c6..143c5216c4d3f 100644 --- a/lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py +++ b/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 @@ def test(self): iterator_children = [ValueCheck(name="item")] 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