Merge pull request #32392 from GiudGiud/PR_ignore_cap

Fix --ignore options with capabilities

Author: loganharbour

python/TestHarness/testers/RunApp.py

@@ -684,9 +684,12 @@ def prepare(self, options):
         if self.specs["capabilities"]:
             # Capabilities from this Tester's specs in addition
             # to capabilities from the global options
-            capabilities = (
-                self._augmented_capabilities | options._augmented_capabilities
-            )
+            if self._augmented_capabilities is not None:
+                capabilities = (
+                    self._augmented_capabilities | options._augmented_capabilities
+                )
+            else:
+                capabilities = options._augmented_capabilities
 
             # Capture the capabilities that we need to dump, if any.
             # For now, we'll lazily just see if each of the

python/TestHarness/tests/test_Capabilities.py

@@ -249,6 +249,12 @@ def test(self):
         )
         self.assertIn(message, jobs[0].getTester().getOutput())
 
+        # Test not filtering due to --ignore: don't skip and don't even check
+        _, jobs = self.runCapabilityTest(
+            ("compiler=unknown", False), cli_args=["--ignore"]
+        )
+        self.assertNotIn("Need compiler=unknown", jobs[0].getTester().getCaveats())
+
     def testAugmented(self):
         """Test filtering tests using augmented application capabilities."""