Disable rpmmacros test for compat

tests/clang-format-diff/main.fmf

@@ -7,7 +7,7 @@ extra-nitrate: TC#0614126
 adjust+:
   # Common requirements when LLVM is not SCL-ized
   - require+:
-      - clang-tools-extra
+      - clang18-tools-extra
     when: "collection is not defined"
 
   # Requirements for SCL-ized LLVM

tests/kernel-ark-build/main.fmf

@@ -7,8 +7,8 @@ component+:
 duration: 4h
 tier: 1
 require+:
-  - llvm-devel
-  - lld
+  - llvm18-devel
+  - lld18
   - git
   - make
   - gcc

tests/libomp/main.fmf

@@ -9,9 +9,9 @@ component+:
   - libomp
 
 require+:
-  - clang-libs
-  - libomp
-  - libomp-devel
+  - clang18-libs
+  - libomp18
+  - libomp18-devel
 
 adjust+:
   # Right now libomp in s390x is supported only in LLVM >= 18 in Fedora

tests/llvm-test-suite/main.fmf

@@ -8,9 +8,13 @@ adjust+:
       or distro == centos
     enabled: false
 
+  - because: "llvm test suite not built for compat packages"
+    enabled: false
+    when: compat is defined
+
 require+:
   - git
-  - clang
+  - clang18
   - ninja-build
   - llvm-test-suite
 duration: 1h

tests/main.fmf

@@ -14,7 +14,7 @@ framework: shell
 
 # Always define "test" key and override in adjust or in each specific test
 # metadata if needed.
-test: ./runtest.sh
+test: "PATH=/usr/lib64/llvm18/bin:$PATH ./runtest.sh"
 
 # Commonly used keys are initialized to empty.
 require: []
@@ -24,7 +24,7 @@ tag: []
 adjust+:
   # Common requirements when LLVM is not SCL-ized
   - require+:
-      - clang
+      - clang18
     when: collection is not defined
 
   # Requirements for SCL-ized LLVM

tests/openmp-rpm/main.fmf

@@ -6,7 +6,7 @@ extra-summary: /tools/clang/openmp-rpm
 extra-task: /tools/clang/openmp-rpm
 extra-nitrate: TC#0614128
 component+:
-  - libomp
+  - libomp18
 
 adjust+:
   # Right now libomp in s390x is supported only in LLVM >= 18 in Fedora
@@ -21,7 +21,7 @@ adjust+:
     continue: false
 
   - require+:
-      - libomp
+      - libomp18
     when: collection is not defined
 
   # Requirements for SCL-ized LLVM

tests/pie-rpm/main.fmf

@@ -2,7 +2,7 @@ summary: Check that we build rpms with -pie
 tier: 1
 
 require+:
-  - clang-libs
+  - clang18-libs
   - rpm-build
   - glibc-static
 

tests/ppc64le-long-double/main.fmf

@@ -10,7 +10,7 @@ adjust+:
     require+:
     - qemu-user-static
     - mock
-    test: ./runtest-fedora.sh
+    test: "PATH=/usr/lib64/llvm18/bin:$PATH ./runtest-fedora.sh"
     when: distro == fedora and arch == x86_64 and snapshot is not defined
     continue: false
 

tests/rhbz_1647130/main.fmf

@@ -7,7 +7,7 @@ extra-nitrate: TC#0614130
 adjust+:
   # Common requirements when LLVM is not SCL-ized
   - require+:
-      - clang-analyzer
+      - clang18-analyzer
     when: "collection is not defined"
 
   # Requirements for SCL-ized LLVM

tests/rpmmacros/main.fmf

@@ -1,6 +1,15 @@
 summary: Test if RPM macros are properly set
 tier: 1
 require+:
-  - clang-devel
+  - clang18-devel
 extra-summary: /tools/clang/rpmmacros
 extra-task: /tools/clang/rpmmacros
+
+adjust+:
+  # From spec file:
+  # File in the macros file for other packages to use.  We are not doing this
+  # in the compat package, because the version macros would conflict with
+  # eachother if both clang and the clang compat package were installed together.
+  - because: "macros.clang is not added to compat packages"
+    enabled: false
+    when: compat is defined

tests/toolchains/main.fmf

@@ -12,8 +12,8 @@ extra-nitrate: TC#0614133
 adjust+:
   # Common requirements when LLVM is not SCL-ized
   - require+:
-      - compiler-rt
-      - lld
+      - compiler-rt18
+      - lld18
     when: "collection is not defined"
 
   # Requirements for SCL-ized LLVM
@@ -36,7 +36,7 @@ adjust+:
     # lld not supported in s390x (LLVM<18) or ppc64. If any lld package was added to
     # requirements, remove it.
   - require-:
-      - lld
+      - lld18
       - llvm-toolset-13.0-lld
       - llvm-toolset-14.0-lld
       - llvm-toolset-15.0-lld
@@ -49,7 +49,7 @@ adjust+:
   # if not. The test will (correctly) fail if we lld is missing in LLVM 18.
   # TODO once LLVM 18 is in the default module stream we can set this a require:
   - recommend+:
-      - lld
+      - lld18
     when: arch == s390x and distro == rhel-8.10
 
   - environment+:
@@ -82,7 +82,7 @@ adjust+:
     require+:
       - libstdc++
       # All archs support lld in snapshots, ensure it's required
-      - lld
+      - lld18
     when: snapshot is defined
     because: llvm-snapshots adjustments
 

tests/use-correct-dwarf-default/main.fmf

@@ -9,7 +9,7 @@ extra-nitrate: TC#0614134
 adjust+:
   # Common requirements when LLVM is not SCL-ized
   - require+:
-      - llvm
+      - llvm18
     when: "collection is not defined"
 
   # Requirements for SCL-ized LLVM