From 60daf3c47de21259268defd83db11cfd705b5448 Mon Sep 17 00:00:00 2001
From: Milos Malik <mmalik@redhat.com>
Date: Mar 18 2024 15:12:13 +0000
Subject: clean up the tests metadata


Metadata of certain tests became outdated. Purpose of this change is:
 * include the rest of components into main.fmf
 * remove the failinfedora tag from tests which pass on Fedora
 * add the failinfedora tag to tests which fail on Fedora or
   which should not be executed

---

diff --git a/libselinux/selinux_restorecon-functions/main.fmf b/libselinux/selinux_restorecon-functions/main.fmf
index 728942e..c7372bb 100644
--- a/libselinux/selinux_restorecon-functions/main.fmf
+++ b/libselinux/selinux_restorecon-functions/main.fmf
@@ -17,7 +17,6 @@ tag:
   - NoRHEL5
   - TIPpass_Security
   - TierCandidatesPASS
-  - failinfedora
   - targeted
 adjust:
   - enabled: false
diff --git a/main.fmf b/main.fmf
index 1be570e..764dffa 100644
--- a/main.fmf
+++ b/main.fmf
@@ -23,11 +23,14 @@ tags: [generic]
 /libsepol:
     component: libsepol
 
+/mcstrans:
+    component: mcstrans
+
 /policycoreutils:
     component: policycoreutils
 
 /selinux-policy:
     component: selinux-policy
 
-/other:
-    component: selinux-policy
+/setools:
+    component: setools
diff --git a/other/collect-denials/main.fmf b/other/collect-denials/main.fmf
index a02c9b6..61b0c0d 100644
--- a/other/collect-denials/main.fmf
+++ b/other/collect-denials/main.fmf
@@ -8,4 +8,5 @@ recommend:
  - policycoreutils
 duration: 5m
 enabled: true
-
+tag:
+ - failinfedora
diff --git a/selinux-policy/interface-definitions/main.fmf b/selinux-policy/interface-definitions/main.fmf
index 0c2b9a3..e54b879 100644
--- a/selinux-policy/interface-definitions/main.fmf
+++ b/selinux-policy/interface-definitions/main.fmf
@@ -15,6 +15,7 @@ tag:
   - NoRHEL4
   - NoRHEL5
   - targeted
+  - failinfedora
 link:
   - verifies: https://issues.redhat.com/browse/RHEL-2616
   - verifies: https://issues.redhat.com/browse/RHEL-16185
diff --git a/selinux-policy/pam_timestamp-and-related/main.fmf b/selinux-policy/pam_timestamp-and-related/main.fmf
index 28e8dfe..8c37de8 100644
--- a/selinux-policy/pam_timestamp-and-related/main.fmf
+++ b/selinux-policy/pam_timestamp-and-related/main.fmf
@@ -39,7 +39,6 @@ tag:
   - TIPpass
   - TIPpass_Security
   - f32friendly
-  - failinfedora
   - targeted
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1791957
diff --git a/selinux-policy/restorecond-fcontext-equivalences/main.fmf b/selinux-policy/restorecond-fcontext-equivalences/main.fmf
index 30bd38d..34be7a6 100644
--- a/selinux-policy/restorecond-fcontext-equivalences/main.fmf
+++ b/selinux-policy/restorecond-fcontext-equivalences/main.fmf
@@ -19,7 +19,6 @@ tag:
   - NoRHEL5
   - NoRHEL6
   - NoRHEL7
-  - failinfedora
   - targeted
 link:
   - verifies: https://issues.redhat.com/browse/RHEL-5032