[lldb][test] 2 - Add gmodules test category explicitly where previously done implicitly

[Michael137]

Summary

Since we don't compile with gmodules implicitly via
debug-info test replication, we should mark all implicit
gmodules tests with the appropriate category so the API
tests get actually run as intended.

[Michael137]

• Add decorator to another test

[aprantl]

Looks good!

lldb/test/API/lang/cpp/gmodules/templates/TestGModules.py

 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
 lldbinline.MakeInlineTest(__file__, globals(), [
-    expectedFailureAll(oslist=["linux"], bugnumber="llvm.org/pr36107",
-        debug_info="gmodules")])
+    expectedFailureAll(oslist=["linux"], bugnumber="llvm.org/pr36107"),
+    add_test_categories(["gmodules"])])

lldb/test/API/lang/objc/modules-app-update/TestClangModulesAppUpdate.py

 
 import os
 import shutil
 
 import lldb
 from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
 
 class TestClangModuleAppUpdate(TestBase):
 
-    @skipIf(debug_info=no_match(["gmodules"]))
+    @add_test_categories(["gmodules"])
     def test_rebuild_app_modules_untouched(self):
         with open(self.getBuildArtifact("module.modulemap"), "w") as f:
             f.write("""
                     module Foo { header "f.h" }
                     """)
         with open(self.getBuildArtifact("f.h"), "w") as f:
             f.write("""
                     @import ObjectiveC;

lldb/test/API/lang/objc/modules-hash-mismatch/TestClangModulesHashMismatch.py

 
 import os
 import shutil
 
 import lldb
 from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
 
 class TestClangModuleHashMismatch(TestBase):
 
-    @skipIf(debug_info=no_match(["gmodules"]))
+    @add_test_categories(["gmodules"])
     def test_expr(self):
         with open(self.getBuildArtifact("module.modulemap"), "w") as f:
             f.write("""
                     module Foo { header "f.h" }
                     """)
         with open(self.getBuildArtifact("f.h"), "w") as f:
             f.write("""
                     typedef int my_int;

lldb/test/API/lang/objc/modules-incomplete/TestIncompleteModules.py

 class IncompleteModulesTestCase(TestBase):
 
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
         # Find the line number to break inside main().
         self.line = line_number('main.m', '// Set breakpoint 0 here.')
 
-    @skipIf(debug_info=no_match(["gmodules"]))
+    @add_test_categories(["gmodules"])
     def test_expr(self):
         self.build()
         exe = self.getBuildArtifact("a.out")
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
         lldbutil.run_break_set_by_file_and_line(
             self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
 
         self.runCmd("run", RUN_SUCCEEDED)

lldb/test/API/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py

 """Test that inline functions from modules are imported correctly"""
 
 
 
 
 import lldb
 from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
 
 class ModulesInlineFunctionsTestCase(TestBase):
 
-    @skipIf(macos_version=["<", "10.12"], debug_info=no_match(["gmodules"]))
+    @add_test_categories(["gmodules"])
+    @skipIf(macos_version=["<", "10.12"])
     def test_expr(self):
         self.build()
         exe = self.getBuildArtifact("a.out")
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
 
         # Break inside the foo function which takes a bar_ptr argument.
         lldbutil.run_to_source_breakpoint(
             self, '// Set breakpoint here.', lldb.SBFileSpec('main.m'))

lldb/test/API/lang/objc/modules-update/TestClangModulesUpdate.py

 
 import os
 import shutil
 
 import lldb
 from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
 
 class TestClangModuleUpdate(TestBase):
 
-    @skipIf(debug_info=no_match(["gmodules"]))
+    @add_test_categories(["gmodules"])
     @skipIfDarwin # rdar://76540904
     def test_expr(self):
         with open(self.getBuildArtifact("module.modulemap"), "w") as f:
             f.write("""
                     module Foo { header "f.h" }
                     """)
         with open(self.getBuildArtifact("f.h"), "w") as f:
             f.write("""

lldb/test/API/lang/objc/objc-struct-argument/TestObjCStructArgument.py

class TestObjCStructArgument(TestBase):
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
         # Find the line numbers to break inside main().
         self.main_source = "test.m"
         self.break_line = line_number(
             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
+    # this test program only builds for ios with -gmodules
+    @add_test_categories(['gmodules', 'pyapi'])
+    @skipIf(oslist=['ios', 'watchos', 'tvos', 'bridgeos'], archs=['armv7', 'arm64'])
     def test_with_python_api(self):
         """Test passing structs to Objective-C methods."""
         self.build()
         exe = self.getBuildArtifact("a.out")
 
         target = self.dbg.CreateTarget(exe)
         self.assertTrue(target, VALID_TARGET)