[Lldb-commits] [lldb] 1c6826e - [lldb][test] 2 - Add gmodules test category explicitly where previously done implicitly

[Michael Buch via lldb-commits]

Author: Michael Buch
Date: 2022-09-26T19:54:24+01:00
New Revision: 1c6826e8fc6d5c47c3ffff573efd8d080939a932

URL: https://github.com/llvm/llvm-project/commit/1c6826e8fc6d5c47c3ffff573efd8d080939a932
DIFF: https://github.com/llvm/llvm-project/commit/1c6826e8fc6d5c47c3ffff573efd8d080939a932.diff

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

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.

Differential Revision: https://reviews.llvm.org/D134574

Added: 
    

Modified: 
    lldb/test/API/lang/cpp/gmodules/templates/TestGModules.py
    lldb/test/API/lang/objc/modules-app-update/TestClangModulesAppUpdate.py
    lldb/test/API/lang/objc/modules-hash-mismatch/TestClangModulesHashMismatch.py
    lldb/test/API/lang/objc/modules-incomplete/TestIncompleteModules.py
    lldb/test/API/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
    lldb/test/API/lang/objc/modules-update/TestClangModulesUpdate.py
    lldb/test/API/lang/objc/objc-struct-argument/TestObjCStructArgument.py

Removed: 
    


################################################################################
diff  --git a/lldb/test/API/lang/cpp/gmodules/templates/TestGModules.py b/lldb/test/API/lang/cpp/gmodules/templates/TestGModules.py
index 69d04636d86b6..7be986f4fcf08 100644
--- a/lldb/test/API/lang/cpp/gmodules/templates/TestGModules.py
+++ b/lldb/test/API/lang/cpp/gmodules/templates/TestGModules.py
@@ -2,5 +2,5 @@
 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"])])

diff  --git a/lldb/test/API/lang/objc/modules-app-update/TestClangModulesAppUpdate.py b/lldb/test/API/lang/objc/modules-app-update/TestClangModulesAppUpdate.py
index d520082443470..629317192d85f 100644
--- a/lldb/test/API/lang/objc/modules-app-update/TestClangModulesAppUpdate.py
+++ b/lldb/test/API/lang/objc/modules-app-update/TestClangModulesAppUpdate.py
@@ -10,7 +10,7 @@
 
 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("""

diff  --git a/lldb/test/API/lang/objc/modules-hash-mismatch/TestClangModulesHashMismatch.py b/lldb/test/API/lang/objc/modules-hash-mismatch/TestClangModulesHashMismatch.py
index 2ce885370cf14..eb58851ee3ee5 100644
--- a/lldb/test/API/lang/objc/modules-hash-mismatch/TestClangModulesHashMismatch.py
+++ b/lldb/test/API/lang/objc/modules-hash-mismatch/TestClangModulesHashMismatch.py
@@ -10,7 +10,7 @@
 
 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("""

diff  --git a/lldb/test/API/lang/objc/modules-incomplete/TestIncompleteModules.py b/lldb/test/API/lang/objc/modules-incomplete/TestIncompleteModules.py
index 95802b4e10122..acb961b57ff92 100644
--- a/lldb/test/API/lang/objc/modules-incomplete/TestIncompleteModules.py
+++ b/lldb/test/API/lang/objc/modules-incomplete/TestIncompleteModules.py
@@ -15,7 +15,7 @@ def 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")

diff  --git a/lldb/test/API/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py b/lldb/test/API/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
index 2db0f87a325bc..81f67867eb525 100644
--- a/lldb/test/API/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
+++ b/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"]))
+    @add_test_categories(["gmodules"])
+    @skipIf(macos_version=["<", "10.12"])
     def test_expr(self):
         self.build()
         exe = self.getBuildArtifact("a.out")

diff  --git a/lldb/test/API/lang/objc/modules-update/TestClangModulesUpdate.py b/lldb/test/API/lang/objc/modules-update/TestClangModulesUpdate.py
index 4056741716b82..e1b5c510a2db0 100644
--- a/lldb/test/API/lang/objc/modules-update/TestClangModulesUpdate.py
+++ b/lldb/test/API/lang/objc/modules-update/TestClangModulesUpdate.py
@@ -10,7 +10,7 @@
 
 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:

diff  --git a/lldb/test/API/lang/objc/objc-struct-argument/TestObjCStructArgument.py b/lldb/test/API/lang/objc/objc-struct-argument/TestObjCStructArgument.py
index 1be684cbfbdcc..f29bdf6c64e6a 100644
--- a/lldb/test/API/lang/objc/objc-struct-argument/TestObjCStructArgument.py
+++ b/lldb/test/API/lang/objc/objc-struct-argument/TestObjCStructArgument.py
@@ -18,8 +18,9 @@ def setUp(self):
         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()