From 2b6d2f1ad2fccf044a21d76e10938687eaa49d8a Mon Sep 17 00:00:00 2001 From: Jesus Checa Hidalgo Date: Tue, 16 Jul 2024 09:24:08 +0200 Subject: [PATCH 1/2] Create compat18 branch --- tests/clang-format-diff/main.fmf | 2 +- tests/kernel-ark-build/main.fmf | 4 ++-- tests/libomp/main.fmf | 6 +++--- tests/llvm-test-suite/main.fmf | 6 +++++- tests/main.fmf | 4 ++-- tests/openmp-rpm/main.fmf | 4 ++-- tests/pie-rpm/main.fmf | 2 +- tests/ppc64le-long-double/main.fmf | 2 +- tests/rhbz_1647130/main.fmf | 2 +- tests/rpmmacros/main.fmf | 2 +- tests/toolchains/main.fmf | 10 +++++----- tests/use-correct-dwarf-default/main.fmf | 2 +- 12 files changed, 25 insertions(+), 21 deletions(-) diff --git a/tests/clang-format-diff/main.fmf b/tests/clang-format-diff/main.fmf index 0fdeb7d..fe75429 100644 --- a/tests/clang-format-diff/main.fmf +++ b/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 diff --git a/tests/kernel-ark-build/main.fmf b/tests/kernel-ark-build/main.fmf index 149eca2..e2a9673 100644 --- a/tests/kernel-ark-build/main.fmf +++ b/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 diff --git a/tests/libomp/main.fmf b/tests/libomp/main.fmf index ccd2300..b15c06d 100644 --- a/tests/libomp/main.fmf +++ b/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 diff --git a/tests/llvm-test-suite/main.fmf b/tests/llvm-test-suite/main.fmf index e084bd1..5cdd257 100644 --- a/tests/llvm-test-suite/main.fmf +++ b/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 diff --git a/tests/main.fmf b/tests/main.fmf index 9b52720..1d0b7a7 100644 --- a/tests/main.fmf +++ b/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 diff --git a/tests/openmp-rpm/main.fmf b/tests/openmp-rpm/main.fmf index 0bd8f48..6cc3572 100644 --- a/tests/openmp-rpm/main.fmf +++ b/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 diff --git a/tests/pie-rpm/main.fmf b/tests/pie-rpm/main.fmf index 0a35fb6..db95a77 100644 --- a/tests/pie-rpm/main.fmf +++ b/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 diff --git a/tests/ppc64le-long-double/main.fmf b/tests/ppc64le-long-double/main.fmf index c17e9b7..d838fdb 100644 --- a/tests/ppc64le-long-double/main.fmf +++ b/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 diff --git a/tests/rhbz_1647130/main.fmf b/tests/rhbz_1647130/main.fmf index c7252a0..ef23dd9 100644 --- a/tests/rhbz_1647130/main.fmf +++ b/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 diff --git a/tests/rpmmacros/main.fmf b/tests/rpmmacros/main.fmf index 05c3245..c1961cf 100644 --- a/tests/rpmmacros/main.fmf +++ b/tests/rpmmacros/main.fmf @@ -1,6 +1,6 @@ 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 diff --git a/tests/toolchains/main.fmf b/tests/toolchains/main.fmf index ad049dc..84957a7 100644 --- a/tests/toolchains/main.fmf +++ b/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 diff --git a/tests/use-correct-dwarf-default/main.fmf b/tests/use-correct-dwarf-default/main.fmf index bdd5ce1..3cfd782 100644 --- a/tests/use-correct-dwarf-default/main.fmf +++ b/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 From 5cce36b93ffebc50f279c3d981b3b5a303b44d57 Mon Sep 17 00:00:00 2001 From: Jesus Checa Hidalgo Date: Wed, 17 Jul 2024 12:48:53 +0200 Subject: [PATCH 2/2] Disable rpmmacros test for compat --- tests/rpmmacros/main.fmf | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/rpmmacros/main.fmf b/tests/rpmmacros/main.fmf index c1961cf..cf12be1 100644 --- a/tests/rpmmacros/main.fmf +++ b/tests/rpmmacros/main.fmf @@ -4,3 +4,12 @@ require+: - 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