[Lldb-commits] [lldb] 0d62e31 - [LLDB][NFC] Fix test that broke due to libc++ std::vector changes

[Shafik Yaghmour via lldb-commits]

Author: Shafik Yaghmour
Date: 2021-11-10T12:29:08-08:00
New Revision: 0d62e31c458526e1db37d11da947e61768c7b522

URL: https://github.com/llvm/llvm-project/commit/0d62e31c458526e1db37d11da947e61768c7b522
DIFF: https://github.com/llvm/llvm-project/commit/0d62e31c458526e1db37d11da947e61768c7b522.diff

LOG: [LLDB][NFC] Fix test that broke due to libc++ std::vector changes

D112976 moved most of the guts of __vector_base into vector, this broke
some LLDB tests by changing the result types that LLDB sees. This updates
the test to reflect the new structure.

Added: 
    

Modified: 
    lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py
    lldb/test/API/commands/expression/import-std-module/vector/TestVectorFromStdModule.py

Removed: 
    


################################################################################
diff  --git a/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py
index e0b511c91bd0f..8c8dfe01a2deb 100644
--- a/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py
+++ b/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py
@@ -23,7 +23,7 @@ def test(self):
         vector_type = "std::vector<int>"
         vector_of_vector_type = "std::vector<" + vector_type + " >"
         size_type = vector_of_vector_type + "::size_type"
-        value_type = "std::__vector_base<int, std::allocator<int> >::value_type"
+        value_type = "std::vector<int>::value_type"
 
         self.runCmd("settings set target.import-std-module true")
 

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 a03c347a728fa..32a254ed218d7 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
@@ -24,7 +24,7 @@ def test(self):
 
         vector_type = "std::vector<int>"
         size_type = vector_type + "::size_type"
-        value_type = "std::__vector_base<int, std::allocator<int> >::value_type"
+        value_type = "std::vector<int>::value_type"
         iterator = vector_type + "::iterator"
         # LLDB's formatter provides us with a artificial 'item' member.
         iterator_children = [ValueCheck(name="item")]