From e43607a0f654fc91ab2a6f197764ce28bd02c858 Mon Sep 17 00:00:00 2001 From: Jesus Checa Hidalgo Date: Wed, 26 Apr 2023 09:59:51 +0200 Subject: [PATCH] cross-compile-i686: Adjust metadata compiler-rt.i686 packages are not shipped in RHEL or CentOS, disable the test in those distros --- cross-compile-i686/main.fmf | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/cross-compile-i686/main.fmf b/cross-compile-i686/main.fmf index 57a4604..a9aabcc 100644 --- a/cross-compile-i686/main.fmf +++ b/cross-compile-i686/main.fmf @@ -13,26 +13,13 @@ adjust: because: "Test applicable only on x86_64 arch" when: arch != x86_64 + - enabled: false + because: "compiler-rt.i686 packages not shipped in RHEL/CentOS" + when: distro == rhel or distro == centos + - require+: - clang - compiler-rt.x86_64 - compiler-rt.i686 - glibc-devel.i686 when: collection is not defined - - # Requirements for SCL-ized LLVM - - require+: - - llvm-toolset-13.0-clang - - llvm-toolset-13.0-compiler-rt - - llvm-toolset-13.0-compiler-rt.i686 - when: collection == llvm-toolset-13.0 - - require+: - - llvm-toolset-14.0-clang - - llvm-toolset-14.0-compiler-rt - - llvm-toolset-14.0-compiler-rt.i686 - when: collection == llvm-toolset-14.0 - - require+: - - llvm-toolset-15.0-clang - - llvm-toolset-15.0-compiler-rt - - llvm-toolset-15.0-compiler-rt.i686 - when: collection == llvm-toolset-15.0