Michael137 created this revision.
Herald added a project: All.
Michael137 requested review of this revision.
Herald added a project: LLDB.
Herald added a subscriber: lldb-commits.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D134346
Files:
lldb/test/API/commands/expression/import_builtin_fileid/Makefile
lldb/test/API/commands/expression/import_builtin_fileid/TestImportBuiltinFileID.py
lldb/test/API/commands/expression/namespace_local_var_same_name_obj_c/Makefile
lldb/test/API/commands/expression/namespace_local_var_same_name_obj_c/TestNamespaceLocalVarSameNameObjC.py
lldb/test/API/commands/expression/persist_objc_pointeetype/TestPersistObjCPointeeType.py
lldb/test/API/commands/expression/top-level/TestTopLevelExprs.py
lldb/test/API/functionalities/target_var/TestTargetVar.py
lldb/test/API/lang/cpp/abi_tag_lookup/TestAbiTagLookup.py
lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/Makefile
lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/TestBreakpointInMemberFuncWNonPrimitiveParams.py
lldb/test/API/lang/cpp/gmodules/basic/Makefile
lldb/test/API/lang/cpp/gmodules/basic/TestWithModuleDebugging.py
lldb/test/API/lang/cpp/gmodules/template-with-same-arg/Makefile
lldb/test/API/lang/cpp/gmodules/template-with-same-arg/TestTemplateWithSameArg.py
lldb/test/API/lang/cpp/template-function/TestTemplateFunctions.py
lldb/test/API/lang/objc/modules-app-update/Makefile
lldb/test/API/lang/objc/modules-app-update/TestClangModulesAppUpdate.py
lldb/test/API/lang/objc/modules-hash-mismatch/Makefile
lldb/test/API/lang/objc/modules-hash-mismatch/TestClangModulesHashMismatch.py
lldb/test/API/lang/objc/modules-incomplete/Makefile
lldb/test/API/lang/objc/modules-incomplete/TestIncompleteModules.py
lldb/test/API/lang/objc/modules-inline-functions/Makefile
lldb/test/API/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
lldb/test/API/lang/objc/modules-update/Makefile
lldb/test/API/lang/objc/modules-update/TestClangModulesUpdate.py
lldb/test/API/lang/objc/objc-struct-argument/Makefile
lldb/test/API/lang/objc/objc-struct-argument/TestObjCStructArgument.py
Index: lldb/test/API/lang/objc/objc-struct-argument/TestObjCStructArgument.py
===================================================================
--- lldb/test/API/lang/objc/objc-struct-argument/TestObjCStructArgument.py
+++ lldb/test/API/lang/objc/objc-struct-argument/TestObjCStructArgument.py
@@ -19,7 +19,7 @@
self.main_source, '// Set breakpoint here.')
@add_test_categories(['pyapi'])
- @skipIf(debug_info=no_match(["gmodules"]), oslist=['ios', 'watchos', 'tvos', 'bridgeos'], archs=['armv7', 'arm64']) # this test program only builds for ios with -gmodules
+ @gmodules_test
def test_with_python_api(self):
"""Test passing structs to Objective-C methods."""
self.build()
Index: lldb/test/API/lang/objc/objc-struct-argument/Makefile
===================================================================
--- lldb/test/API/lang/objc/objc-struct-argument/Makefile
+++ lldb/test/API/lang/objc/objc-struct-argument/Makefile
@@ -1,3 +1,4 @@
+MAKE_GMODULES = YES
OBJC_SOURCES := test.m
LD_EXTRAS := -lobjc -framework Foundation
Index: lldb/test/API/lang/objc/modules-update/TestClangModulesUpdate.py
===================================================================
--- lldb/test/API/lang/objc/modules-update/TestClangModulesUpdate.py
+++ lldb/test/API/lang/objc/modules-update/TestClangModulesUpdate.py
@@ -10,7 +10,7 @@
class TestClangModuleUpdate(TestBase):
- @skipIf(debug_info=no_match(["gmodules"]))
+ @gmodules_test
@skipIfDarwin # rdar://76540904
def test_expr(self):
with open(self.getBuildArtifact("module.modulemap"), "w") as f:
Index: lldb/test/API/lang/objc/modules-update/Makefile
===================================================================
--- lldb/test/API/lang/objc/modules-update/Makefile
+++ lldb/test/API/lang/objc/modules-update/Makefile
@@ -1,3 +1,4 @@
+MAKE_GMODULES = YES
CFLAGS_EXTRAS = -I$(BUILDDIR)
USE_PRIVATE_MODULE_CACHE = YES
include Makefile.rules
Index: lldb/test/API/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
===================================================================
--- lldb/test/API/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
+++ lldb/test/API/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
@@ -11,7 +11,8 @@
class ModulesInlineFunctionsTestCase(TestBase):
- @skipIf(macos_version=["<", "10.12"], debug_info=no_match(["gmodules"]))
+ @skipIf(macos_version=["<", "10.12"])
+ @gmodules_test
def test_expr(self):
self.build()
exe = self.getBuildArtifact("a.out")
Index: lldb/test/API/lang/objc/modules-inline-functions/Makefile
===================================================================
--- lldb/test/API/lang/objc/modules-inline-functions/Makefile
+++ lldb/test/API/lang/objc/modules-inline-functions/Makefile
@@ -1,3 +1,4 @@
+MAKE_GMODULES = YES
C_SOURCES := myModule.c
OBJC_SOURCES := main.m
Index: lldb/test/API/lang/objc/modules-incomplete/TestIncompleteModules.py
===================================================================
--- lldb/test/API/lang/objc/modules-incomplete/TestIncompleteModules.py
+++ lldb/test/API/lang/objc/modules-incomplete/TestIncompleteModules.py
@@ -15,7 +15,7 @@
# Find the line number to break inside main().
self.line = line_number('main.m', '// Set breakpoint 0 here.')
- @skipIf(debug_info=no_match(["gmodules"]))
+ @gmodules_test
def test_expr(self):
self.build()
exe = self.getBuildArtifact("a.out")
Index: lldb/test/API/lang/objc/modules-incomplete/Makefile
===================================================================
--- lldb/test/API/lang/objc/modules-incomplete/Makefile
+++ lldb/test/API/lang/objc/modules-incomplete/Makefile
@@ -1,3 +1,4 @@
+MAKE_GMODULES = YES
OBJC_SOURCES := main.m myModule.m
CFLAGS_EXTRAS = $(MANDATORY_MODULE_BUILD_CFLAGS)
Index: lldb/test/API/lang/objc/modules-hash-mismatch/TestClangModulesHashMismatch.py
===================================================================
--- lldb/test/API/lang/objc/modules-hash-mismatch/TestClangModulesHashMismatch.py
+++ lldb/test/API/lang/objc/modules-hash-mismatch/TestClangModulesHashMismatch.py
@@ -10,7 +10,7 @@
class TestClangModuleHashMismatch(TestBase):
- @skipIf(debug_info=no_match(["gmodules"]))
+ @gmodules_test
def test_expr(self):
with open(self.getBuildArtifact("module.modulemap"), "w") as f:
f.write("""
Index: lldb/test/API/lang/objc/modules-hash-mismatch/Makefile
===================================================================
--- lldb/test/API/lang/objc/modules-hash-mismatch/Makefile
+++ lldb/test/API/lang/objc/modules-hash-mismatch/Makefile
@@ -1,3 +1,4 @@
+MAKE_GMODULES = YES
OBJC_SOURCES := main.m
CFLAGS_EXTRAS = -I$(BUILDDIR)
USE_PRIVATE_MODULE_CACHE = YES
Index: lldb/test/API/lang/objc/modules-app-update/TestClangModulesAppUpdate.py
===================================================================
--- lldb/test/API/lang/objc/modules-app-update/TestClangModulesAppUpdate.py
+++ lldb/test/API/lang/objc/modules-app-update/TestClangModulesAppUpdate.py
@@ -10,7 +10,7 @@
class TestClangModuleAppUpdate(TestBase):
- @skipIf(debug_info=no_match(["gmodules"]))
+ @gmodules_test
def test_rebuild_app_modules_untouched(self):
with open(self.getBuildArtifact("module.modulemap"), "w") as f:
f.write("""
Index: lldb/test/API/lang/objc/modules-app-update/Makefile
===================================================================
--- lldb/test/API/lang/objc/modules-app-update/Makefile
+++ lldb/test/API/lang/objc/modules-app-update/Makefile
@@ -1,3 +1,4 @@
+MAKE_GMODULES = YES
CFLAGS_EXTRAS = -I$(BUILDDIR)
USE_PRIVATE_MODULE_CACHE := YES
OBJC_SOURCES := main.m foo.m
Index: lldb/test/API/lang/cpp/template-function/TestTemplateFunctions.py
===================================================================
--- lldb/test/API/lang/cpp/template-function/TestTemplateFunctions.py
+++ lldb/test/API/lang/cpp/template-function/TestTemplateFunctions.py
@@ -51,6 +51,6 @@
self.do_test_template_function(True)
@skipIfWindows
- @expectedFailureAll(debug_info=["dwarf", "gmodules", "dwo"])
+ @expectedFailureAll(debug_info=["dwarf", "dwo"])
def test_template_function_without_cast(self):
self.do_test_template_function(False)
Index: lldb/test/API/lang/cpp/gmodules/template-with-same-arg/TestTemplateWithSameArg.py
===================================================================
--- lldb/test/API/lang/cpp/gmodules/template-with-same-arg/TestTemplateWithSameArg.py
+++ lldb/test/API/lang/cpp/gmodules/template-with-same-arg/TestTemplateWithSameArg.py
@@ -33,7 +33,7 @@
self.build()
self.main_source_file = lldb.SBFileSpec("main.cpp")
- @add_test_categories(["gmodules"])
+ @gmodules_test
def test_same_template_arg(self):
lldbutil.run_to_source_breakpoint(self, "Break here", self.main_source_file)
@@ -49,7 +49,7 @@
])
])
- @add_test_categories(["gmodules"])
+ @gmodules_test
def test_duplicate_decls(self):
lldbutil.run_to_source_breakpoint(self, "Break here", self.main_source_file)
Index: lldb/test/API/lang/cpp/gmodules/template-with-same-arg/Makefile
===================================================================
--- lldb/test/API/lang/cpp/gmodules/template-with-same-arg/Makefile
+++ lldb/test/API/lang/cpp/gmodules/template-with-same-arg/Makefile
@@ -1,3 +1,4 @@
+MAKE_GMODULES = YES
CXX_SOURCES := main.cpp module1.cpp module2.cpp base_module.cpp
include Makefile.rules
Index: lldb/test/API/lang/cpp/gmodules/basic/TestWithModuleDebugging.py
===================================================================
--- lldb/test/API/lang/cpp/gmodules/basic/TestWithModuleDebugging.py
+++ lldb/test/API/lang/cpp/gmodules/basic/TestWithModuleDebugging.py
@@ -8,7 +8,7 @@
class TestWithGmodulesDebugInfo(TestBase):
@skipIf(bugnumber="llvm.org/pr36146", oslist=["linux"], archs=["i386"])
- @add_test_categories(["gmodules"])
+ @gmodules_test
def test_specialized_typedef_from_pch(self):
self.build()
Index: lldb/test/API/lang/cpp/gmodules/basic/Makefile
===================================================================
--- lldb/test/API/lang/cpp/gmodules/basic/Makefile
+++ lldb/test/API/lang/cpp/gmodules/basic/Makefile
@@ -1,3 +1,4 @@
+MAKE_GMODULES = YES
PCH_CXX_SOURCE = pch.h
CXX_SOURCES = main.cpp
CFLAGS_EXTRAS := $(MODULE_DEBUG_INFO_FLAGS)
Index: lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/TestBreakpointInMemberFuncWNonPrimitiveParams.py
===================================================================
--- lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/TestBreakpointInMemberFuncWNonPrimitiveParams.py
+++ lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/TestBreakpointInMemberFuncWNonPrimitiveParams.py
@@ -14,7 +14,7 @@
class TestBreakpointInMemberFuncWNonPrimitiveParams(TestBase):
- @add_test_categories(["gmodules"])
+ @gmodules_test
def test_breakpint_in_member_func_w_non_primitie_params(self):
self.build()
lldbutil.run_to_source_breakpoint(self, '// break here',
Index: lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/Makefile
===================================================================
--- lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/Makefile
+++ lldb/test/API/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/Makefile
@@ -1,3 +1,4 @@
+MAKE_GMODULES = YES
CXX_SOURCES = main.cpp a.cpp
CFLAGS_EXTRAS = $(MANDATORY_CXXMODULE_BUILD_CFLAGS)
Index: lldb/test/API/lang/cpp/abi_tag_lookup/TestAbiTagLookup.py
===================================================================
--- lldb/test/API/lang/cpp/abi_tag_lookup/TestAbiTagLookup.py
+++ lldb/test/API/lang/cpp/abi_tag_lookup/TestAbiTagLookup.py
@@ -11,7 +11,7 @@
class AbiTagLookupTestCase(TestBase):
@skipIfWindows
- @expectedFailureAll(debug_info=["dwarf", "gmodules", "dwo"])
+ @expectedFailureAll(debug_info=["dwarf", "dwo"])
def test_abi_tag_lookup(self):
self.build()
lldbutil.run_to_source_breakpoint(self, 'Break here',
Index: lldb/test/API/functionalities/target_var/TestTargetVar.py
===================================================================
--- lldb/test/API/functionalities/target_var/TestTargetVar.py
+++ lldb/test/API/functionalities/target_var/TestTargetVar.py
@@ -12,7 +12,6 @@
@skipUnlessDarwin
@skipIfDarwinEmbedded # needs x86_64
- @skipIf(debug_info="gmodules") # not relevant
@skipIf(compiler="clang", compiler_version=['<', '7.0'])
def testTargetVarExpr(self):
self.build()
Index: lldb/test/API/commands/expression/top-level/TestTopLevelExprs.py
===================================================================
--- lldb/test/API/commands/expression/top-level/TestTopLevelExprs.py
+++ lldb/test/API/commands/expression/top-level/TestTopLevelExprs.py
@@ -51,7 +51,6 @@
self.runCmd("run", RUN_SUCCEEDED)
@add_test_categories(['pyapi'])
- @skipIf(debug_info="gmodules") # not relevant
@skipIf(oslist=["windows"]) # Error in record layout on Windows
def test_top_level_expressions(self):
self.build_and_run()
Index: lldb/test/API/commands/expression/persist_objc_pointeetype/TestPersistObjCPointeeType.py
===================================================================
--- lldb/test/API/commands/expression/persist_objc_pointeetype/TestPersistObjCPointeeType.py
+++ lldb/test/API/commands/expression/persist_objc_pointeetype/TestPersistObjCPointeeType.py
@@ -19,7 +19,6 @@
self.line = line_number('main.m', '// break here')
@skipIf(archs=["i386", "i686"])
- @skipIf(debug_info="gmodules", archs=['arm64', 'armv7', 'armv7k', 'arm64e', 'arm64_32']) # compile error with gmodules for iOS
@add_test_categories(["objc"])
def test_with(self):
"""Test that we can p *objcObject"""
Index: lldb/test/API/commands/expression/namespace_local_var_same_name_obj_c/TestNamespaceLocalVarSameNameObjC.py
===================================================================
--- lldb/test/API/commands/expression/namespace_local_var_same_name_obj_c/TestNamespaceLocalVarSameNameObjC.py
+++ lldb/test/API/commands/expression/namespace_local_var_same_name_obj_c/TestNamespaceLocalVarSameNameObjC.py
@@ -5,7 +5,8 @@
class TestNamespaceLocalVarSameNameObjC(TestBase):
- @add_test_categories(["gmodules", "objc"])
+ @add_test_categories(["objc"])
+ @gmodules_test
def test_namespace_local_var_same_name_obj_c(self):
self.build()
Index: lldb/test/API/commands/expression/namespace_local_var_same_name_obj_c/Makefile
===================================================================
--- lldb/test/API/commands/expression/namespace_local_var_same_name_obj_c/Makefile
+++ lldb/test/API/commands/expression/namespace_local_var_same_name_obj_c/Makefile
@@ -1,3 +1,4 @@
+MAKE_GMODULES = YES
OBJCXX_SOURCES := main.mm util.mm
Index: lldb/test/API/commands/expression/import_builtin_fileid/TestImportBuiltinFileID.py
===================================================================
--- lldb/test/API/commands/expression/import_builtin_fileid/TestImportBuiltinFileID.py
+++ lldb/test/API/commands/expression/import_builtin_fileid/TestImportBuiltinFileID.py
@@ -13,7 +13,8 @@
class TestImportBuiltinFileID(TestBase):
@skipIfDarwinEmbedded
- @add_test_categories(["gmodules", "objc"])
+ @add_test_categories(["objc"])
+ @gmodules_test
def test_import_builtin_fileid(self):
self.build()
Index: lldb/test/API/commands/expression/import_builtin_fileid/Makefile
===================================================================
--- lldb/test/API/commands/expression/import_builtin_fileid/Makefile
+++ lldb/test/API/commands/expression/import_builtin_fileid/Makefile
@@ -1,3 +1,4 @@
+MAKE_GMODULES = YES
OBJC_SOURCES := main.m
LD_EXTRAS := -framework Cocoa
include Makefile.rules
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
