This revision was automatically updated to reflect the committed changes.
Closed by commit rGad81d019a62d: [lldb][Test] Check compiler in data forammter
compiler version checks (authored by Michael137).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D143656/new/
https://reviews.llvm.org/D143656
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/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py
lldb/test/API/commands/expression/import-std-module/forward_list/TestForwardListFromStdModule.py
lldb/test/API/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentListFromStdModule.py
lldb/test/API/commands/expression/import-std-module/list/TestListFromStdModule.py
lldb/test/API/commands/expression/import-std-module/non-module-type-separation/TestNonModuleTypeSeparation.py
lldb/test/API/commands/expression/import-std-module/queue/TestQueueFromStdModule.py
lldb/test/API/commands/expression/import-std-module/retry-with-std-module/TestRetryWithStdModule.py
lldb/test/API/commands/expression/import-std-module/unique_ptr-dbg-info-content/TestUniquePtrDbgInfoContent.py
lldb/test/API/commands/expression/import-std-module/unique_ptr/TestUniquePtrFromStdModule.py
lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py
lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py
lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/shared_ptr/TestDataFormatterLibcxxSharedPtr.py
lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/TestDataFormatterLibcxxStringView.py
lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/unique_ptr/TestDataFormatterLibcxxUniquePtr.py
Index: lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/unique_ptr/TestDataFormatterLibcxxUniquePtr.py
===================================================================
--- lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/unique_ptr/TestDataFormatterLibcxxUniquePtr.py
+++ lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/unique_ptr/TestDataFormatterLibcxxUniquePtr.py
@@ -15,13 +15,13 @@
if qualifiers:
qualifiers = ' ' + qualifiers
- if self.expectedCompilerVersion(['>', '16.0']):
+ if self.expectedCompiler(["clang"]) and self.expectedCompilerVersion(['>', '16.0']):
return f'std::unique_ptr<{pointee_type}>{qualifiers}'
else:
return f'std::unique_ptr<{pointee_type}, std::default_delete<{pointee_type}> >{qualifiers}'
def make_expected_basic_string_ptr(self) -> str:
- if self.expectedCompilerVersion(['>', '16.0']):
+ if self.expectedCompiler(["clang"]) and self.expectedCompilerVersion(['>', '16.0']):
return f'std::unique_ptr<std::basic_string<char> >'
else:
return 'std::unique_ptr<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, ' \
Index: lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/TestDataFormatterLibcxxStringView.py
===================================================================
--- lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/TestDataFormatterLibcxxStringView.py
+++ lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/TestDataFormatterLibcxxStringView.py
@@ -56,7 +56,7 @@
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
- if self.expectedCompilerVersion(['>', '16.0']):
+ if self.expectedCompiler(["clang"]) and self.expectedCompilerVersion(['>', '16.0']):
expected_basic_string = 'std::basic_string<unsigned char>'
expected_basic_string_view = 'std::basic_string_view<unsigned char>'
else:
Index: lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
===================================================================
--- lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
+++ lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
@@ -52,7 +52,7 @@
ns = self.namespace
- if self.expectedCompilerVersion(['>', '16.0']):
+ if self.expectedCompiler(["clang"]) and self.expectedCompilerVersion(['>', '16.0']):
expected_basic_string = '%s::basic_string<unsigned char>'%ns
else:
expected_basic_string = '%s::basic_string<unsigned char, %s::char_traits<unsigned char>, ' \
Index: lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/shared_ptr/TestDataFormatterLibcxxSharedPtr.py
===================================================================
--- lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/shared_ptr/TestDataFormatterLibcxxSharedPtr.py
+++ lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/shared_ptr/TestDataFormatterLibcxxSharedPtr.py
@@ -58,7 +58,7 @@
self.assertRegex(valobj.summary, r"^10( strong=1)? weak=1$")
self.assertNotEqual(valobj.child[0].unsigned, 0)
- if self.expectedCompilerVersion(['>', '16.0']):
+ if self.expectedCompiler(["clang"]) and self.expectedCompilerVersion(['>', '16.0']):
string_type = "std::basic_string<char>"
else:
string_type = "std::basic_string<char, std::char_traits<char>, std::allocator<char> >"
Index: lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py
===================================================================
--- lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py
+++ lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py
@@ -18,7 +18,7 @@
"// Set break point at this line.",
lldb.SBFileSpec("main.cpp"))
- if self.expectedCompilerVersion(['>', '16.0']):
+ if self.expectedCompiler(["clang"]) and self.expectedCompilerVersion(['>', '16.0']):
vector_type = "std::vector<int>"
vector_of_vector_type = "std::vector<std::vector<int> >"
else:
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
@@ -22,7 +22,7 @@
self.runCmd("settings set target.import-std-module true")
- if self.expectedCompilerVersion(['>', '16.0']):
+ if self.expectedCompiler(["clang"]) and self.expectedCompilerVersion(['>', '16.0']):
vector_type = "std::vector<Foo>"
else:
vector_type = "std::vector<Foo, std::allocator<Foo> >"
Index: lldb/test/API/commands/expression/import-std-module/unique_ptr/TestUniquePtrFromStdModule.py
===================================================================
--- lldb/test/API/commands/expression/import-std-module/unique_ptr/TestUniquePtrFromStdModule.py
+++ lldb/test/API/commands/expression/import-std-module/unique_ptr/TestUniquePtrFromStdModule.py
@@ -22,7 +22,7 @@
self.runCmd("settings set target.import-std-module true")
- if self.expectedCompilerVersion(['>', '16.0']):
+ if self.expectedCompiler(["clang"]) and self.expectedCompilerVersion(['>', '16.0']):
ptr_type = "std::unique_ptr<int>"
else:
ptr_type = "std::unique_ptr<int, std::default_delete<int> >"
Index: lldb/test/API/commands/expression/import-std-module/unique_ptr-dbg-info-content/TestUniquePtrDbgInfoContent.py
===================================================================
--- lldb/test/API/commands/expression/import-std-module/unique_ptr-dbg-info-content/TestUniquePtrDbgInfoContent.py
+++ lldb/test/API/commands/expression/import-std-module/unique_ptr-dbg-info-content/TestUniquePtrDbgInfoContent.py
@@ -22,7 +22,7 @@
self.runCmd("settings set target.import-std-module true")
- if self.expectedCompilerVersion(['>', '16.0']):
+ if self.expectedCompiler(["clang"]) and self.expectedCompilerVersion(['>', '16.0']):
ptr_type = "std::unique_ptr<Foo>"
else:
ptr_type = "std::unique_ptr<Foo, std::default_delete<Foo> >"
Index: lldb/test/API/commands/expression/import-std-module/retry-with-std-module/TestRetryWithStdModule.py
===================================================================
--- lldb/test/API/commands/expression/import-std-module/retry-with-std-module/TestRetryWithStdModule.py
+++ lldb/test/API/commands/expression/import-std-module/retry-with-std-module/TestRetryWithStdModule.py
@@ -14,7 +14,7 @@
"// Set break point at this line.",
lldb.SBFileSpec("main.cpp"))
- if self.expectedCompilerVersion(['>', '16.0']):
+ if self.expectedCompiler(["clang"]) and self.expectedCompilerVersion(['>', '16.0']):
vec_type = "std::vector<int>"
else:
vec_type = "std::vector<int, std::allocator<int> >"
Index: lldb/test/API/commands/expression/import-std-module/queue/TestQueueFromStdModule.py
===================================================================
--- lldb/test/API/commands/expression/import-std-module/queue/TestQueueFromStdModule.py
+++ lldb/test/API/commands/expression/import-std-module/queue/TestQueueFromStdModule.py
@@ -20,7 +20,7 @@
self.runCmd("settings set target.import-std-module true")
- if self.expectedCompilerVersion(['>', '16.0']):
+ if self.expectedCompiler(["clang"]) and self.expectedCompilerVersion(['>', '16.0']):
queue_type = "std::queue<C>"
else:
queue_type = "std::queue<C, std::deque<C, std::allocator<C> > >"
@@ -56,7 +56,7 @@
result_value="5")
# Test std::queue functionality with a std::list.
- if self.expectedCompilerVersion(['>', '16.0']):
+ if self.expectedCompiler(["clang"]) and self.expectedCompilerVersion(['>', '16.0']):
queue_type = "std::queue<C, std::list<C> >"
else:
queue_type = "std::queue<C, std::list<C, std::allocator<C> > >"
Index: lldb/test/API/commands/expression/import-std-module/non-module-type-separation/TestNonModuleTypeSeparation.py
===================================================================
--- lldb/test/API/commands/expression/import-std-module/non-module-type-separation/TestNonModuleTypeSeparation.py
+++ lldb/test/API/commands/expression/import-std-module/non-module-type-separation/TestNonModuleTypeSeparation.py
@@ -31,7 +31,7 @@
ValueCheck(value="2"),
]
- if self.expectedCompilerVersion(['>', '16.0']):
+ if self.expectedCompiler(["clang"]) and self.expectedCompilerVersion(['>', '16.0']):
vector_type = "std::vector<int>"
dbg_vec_type = "std::vector<DbgInfoClass>"
module_vector_type = "std::vector<int>"
Index: lldb/test/API/commands/expression/import-std-module/list/TestListFromStdModule.py
===================================================================
--- lldb/test/API/commands/expression/import-std-module/list/TestListFromStdModule.py
+++ lldb/test/API/commands/expression/import-std-module/list/TestListFromStdModule.py
@@ -20,7 +20,7 @@
self.runCmd("settings set target.import-std-module true")
- if self.expectedCompilerVersion(['>', '16.0']):
+ if self.expectedCompiler(["clang"]) and self.expectedCompilerVersion(['>', '16.0']):
list_type = "std::list<int>"
else:
list_type = "std::list<int, std::allocator<int> >"
Index: lldb/test/API/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentListFromStdModule.py
===================================================================
--- lldb/test/API/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentListFromStdModule.py
+++ lldb/test/API/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentListFromStdModule.py
@@ -22,7 +22,7 @@
self.runCmd("settings set target.import-std-module true")
- if self.expectedCompilerVersion(['>', '16.0']):
+ if self.expectedCompiler(["clang"]) and self.expectedCompilerVersion(['>', '16.0']):
list_type = "std::list<Foo>"
else:
list_type = "std::list<Foo, std::allocator<Foo> >"
Index: lldb/test/API/commands/expression/import-std-module/forward_list/TestForwardListFromStdModule.py
===================================================================
--- lldb/test/API/commands/expression/import-std-module/forward_list/TestForwardListFromStdModule.py
+++ lldb/test/API/commands/expression/import-std-module/forward_list/TestForwardListFromStdModule.py
@@ -20,7 +20,7 @@
self.runCmd("settings set target.import-std-module true")
- if self.expectedCompilerVersion(['>', '16.0']):
+ if self.expectedCompiler(["clang"]) and self.expectedCompilerVersion(['>', '16.0']):
list_type = "std::forward_list<int>"
else:
list_type = "std::forward_list<int, std::allocator<int> >"
Index: lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py
===================================================================
--- lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py
+++ lldb/test/API/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardListFromStdModule.py
@@ -20,7 +20,7 @@
self.runCmd("settings set target.import-std-module true")
- if self.expectedCompilerVersion(['>', '16.0']):
+ if self.expectedCompiler(["clang"]) and self.expectedCompilerVersion(['>', '16.0']):
list_type = "std::forward_list<Foo>"
else:
list_type = "std::forward_list<Foo, std::allocator<Foo> >"
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
@@ -21,7 +21,7 @@
self.runCmd("settings set target.import-std-module true")
- if self.expectedCompilerVersion(['>', '16.0']):
+ if self.expectedCompiler(["clang"]) and self.expectedCompilerVersion(['>', '16.0']):
deque_type = "std::deque<Foo>"
else:
deque_type = "std::deque<Foo, std::allocator<Foo> >"
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
@@ -20,7 +20,7 @@
self.runCmd("settings set target.import-std-module true")
- if self.expectedCompilerVersion(['>', '16.0']):
+ if self.expectedCompiler(["clang"]) and self.expectedCompilerVersion(['>', '16.0']):
deque_type = "std::deque<int>"
else:
deque_type = "std::deque<int, std::allocator<int> >"
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
