From f5a68fd4b09bf05128021971e74a1cd1d62e9185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Prchl=C3=ADk?= Date: Tue, 15 Feb 2022 11:15:20 +0100 Subject: [PATCH] tests: skip on s390x lld isn't being built nor shipped for this architecture, unlike many other LLVM components. Make tests aware of their relevancy. --- tests/basic/main.fmf | 4 ++++ tests/build-gating-alternatives.fmf | 4 ++++ tests/build-gating.fmf | 4 ++++ tests/gcc-compat-basic/main.fmf | 4 ++++ tests/ld-alternative/main.fmf | 4 ++++ tests/lit-tests/main.fmf | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/tests/basic/main.fmf b/tests/basic/main.fmf index 0ee8755..34fd478 100644 --- a/tests/basic/main.fmf +++ b/tests/basic/main.fmf @@ -2,6 +2,10 @@ summary: Test lld with clang test: "$WITH_SCL ./test.sh" require: [] adjust: + - because: lld is not shipped for s390x + enabled: false + when: arch == s390x + # Common requirements when LLVM is not SCL-ized - require+: - clang diff --git a/tests/build-gating-alternatives.fmf b/tests/build-gating-alternatives.fmf index cb62300..24a582d 100644 --- a/tests/build-gating-alternatives.fmf +++ b/tests/build-gating-alternatives.fmf @@ -19,6 +19,10 @@ adjust: and trigger != build enabled: false + - because: lld is not shipped for s390x + enabled: false + when: arch == s390x + - because: "When testing SCL-ized LLVM, the collection must be enabled first" environment+: WITH_SCL: "scl enable llvm-toolset-13.0" diff --git a/tests/build-gating.fmf b/tests/build-gating.fmf index 583ed6f..60ada75 100644 --- a/tests/build-gating.fmf +++ b/tests/build-gating.fmf @@ -19,6 +19,10 @@ adjust: and trigger != build enabled: false + - because: lld is not shipped for s390x + enabled: false + when: arch == s390x + - because: "When testing SCL-ized LLVM, the collection must be enabled first" environment+: WITH_SCL: "scl enable llvm-toolset-13.0" diff --git a/tests/gcc-compat-basic/main.fmf b/tests/gcc-compat-basic/main.fmf index 2cf6e20..85beb9a 100644 --- a/tests/gcc-compat-basic/main.fmf +++ b/tests/gcc-compat-basic/main.fmf @@ -3,6 +3,10 @@ test: "$WITH_SCL ./test.sh" require: - gcc adjust: + - because: lld is not shipped for s390x + enabled: false + when: arch == s390x + # Common requirements when LLVM is not SCL-ized - require+: - lld diff --git a/tests/ld-alternative/main.fmf b/tests/ld-alternative/main.fmf index 7144ea1..7234656 100644 --- a/tests/ld-alternative/main.fmf +++ b/tests/ld-alternative/main.fmf @@ -6,6 +6,10 @@ tag: require: - binutils adjust: + - because: lld is not shipped for s390x + enabled: false + when: arch == s390x + # Common requirements when LLVM is not SCL-ized - require+: - lld diff --git a/tests/lit-tests/main.fmf b/tests/lit-tests/main.fmf index 2614d0e..0ae9ac1 100644 --- a/tests/lit-tests/main.fmf +++ b/tests/lit-tests/main.fmf @@ -3,6 +3,10 @@ test: "$WITH_SCL ./test.sh" duration: 30m require: [] adjust: + - because: lld is not shipped for s390x + enabled: false + when: arch == s390x + # Common requirements when LLVM is not SCL-ized - require+: - lld