From 718bd7a1274c4964171299be5eeb5816e0244ab4 Mon Sep 17 00:00:00 2001 From: Jesus Checa Hidalgo Date: Wed, 20 Jul 2022 14:22:21 +0200 Subject: [PATCH] tests: fedora-flags * Fixed broken dependency on annobin. Requiring just redhat-rpm-config should pull the correct annobin rpm * Added SCL specific requirements for LLVM 13 and 14 --- tests/fedora-flags/main.fmf | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/tests/fedora-flags/main.fmf b/tests/fedora-flags/main.fmf index 02f6ce5..f2728ba 100644 --- a/tests/fedora-flags/main.fmf +++ b/tests/fedora-flags/main.fmf @@ -1,16 +1,29 @@ summary: fedora-flags test: "$WITH_SCL ./test.sh" require: - - annobin - - clang - redhat-rpm-config adjust: + + # Common requirements when LLVM is not SCL-ized + - require+: + - clang + when: "collection is not defined" + + # Requirements for SCL-ized LLVM + - require+: + - llvm-toolset-13.0-clang + when: "collection == llvm-toolset-13.0" + - require+: + - llvm-toolset-14.0-clang + when: "collection == llvm-toolset-14.0" + - because: s390x does not have epel repo which is required to provide rpm macros enabled: false when: >- distro == rhel-7 and arch == s390x + # Note: this needs epel-release repo to be available - because: "To enable rpm macros not available by default (e.g. build_cflags), epel-rpm-macros is needed" require+: - epel-rpm-macros