diff --git a/tests/basic/main.fmf b/tests/basic/main.fmf index e75cd73..0ee8755 100644 --- a/tests/basic/main.fmf +++ b/tests/basic/main.fmf @@ -1,5 +1,15 @@ summary: Test lld with clang -test: ./test.sh -require: - - lld - - clang +test: "$WITH_SCL ./test.sh" +require: [] +adjust: + # Common requirements when LLVM is not SCL-ized + - require+: + - clang + - lld + when: "collection is not defined" + + # Requirements for SCL-ized LLVM + - require+: + - llvm-toolset-13.0-clang + - llvm-toolset-13.0-lld + when: "collection == llvm-toolset-13.0" diff --git a/tests/build-gating-alternatives.fmf b/tests/build-gating-alternatives.fmf index aff18ea..cb62300 100644 --- a/tests/build-gating-alternatives.fmf +++ b/tests/build-gating-alternatives.fmf @@ -1,3 +1,15 @@ +# +# Build/PR gating tests for *LLVM 13* +# +# Compatible with various LLVM 13 distributions: +# +# * Fedora (ursine packages) +# * Centos 9 stream (ursine packages) +# * RHEL-9 (ursine packages) +# * RHEL-8 (Red Hat module) +# * RHEL-7 (software collection) +# + summary: LLD tests for build/PR gating, testing alternatives and spoiling the installation adjust: - because: "Plan to be ran when either executed locally, or executed by CI system to gate a build or PR." @@ -6,16 +18,18 @@ adjust: and trigger != commit and trigger != build enabled: false + + - because: "When testing SCL-ized LLVM, the collection must be enabled first" + environment+: + WITH_SCL: "scl enable llvm-toolset-13.0" + when: "collection == llvm-toolset-13.0" + discover: - name: lld-tests how: fmf test: ld-alternative execute: how: tmt -prepare: - - name: packages - how: install - package: lld provision: hardware: memory: ">= 4 GiB" diff --git a/tests/build-gating.fmf b/tests/build-gating.fmf index dfc0ea7..583ed6f 100644 --- a/tests/build-gating.fmf +++ b/tests/build-gating.fmf @@ -1,3 +1,15 @@ +# +# Build/PR gating tests for *LLVM 13* +# +# Compatible with various LLVM 13 distributions: +# +# * Fedora (ursine packages) +# * Centos 9 stream (ursine packages) +# * RHEL-9 (ursine packages) +# * RHEL-8 (Red Hat module) +# * RHEL-7 (software collection) +# + summary: LLD tests for build/PR gating adjust: - because: "Plan to be ran when either executed locally, or executed by CI system to gate a build or PR." @@ -6,6 +18,12 @@ adjust: and trigger != commit and trigger != build enabled: false + + - because: "When testing SCL-ized LLVM, the collection must be enabled first" + environment+: + WITH_SCL: "scl enable llvm-toolset-13.0" + when: "collection == llvm-toolset-13.0" + discover: - name: lld-tests how: fmf @@ -17,10 +35,6 @@ discover: test: integration-test-suite execute: how: tmt -prepare: - - name: packages - how: install - package: lld provision: hardware: memory: ">= 4 GiB" diff --git a/tests/gcc-compat-basic/main.fmf b/tests/gcc-compat-basic/main.fmf index e2c19c6..2cf6e20 100644 --- a/tests/gcc-compat-basic/main.fmf +++ b/tests/gcc-compat-basic/main.fmf @@ -1,5 +1,14 @@ summary: Test lld with gcc -test: ./test.sh +test: "$WITH_SCL ./test.sh" require: - - lld - gcc +adjust: + # Common requirements when LLVM is not SCL-ized + - require+: + - lld + when: "collection is not defined" + + # Requirements for SCL-ized LLVM + - require+: + - llvm-toolset-13.0-lld + when: "collection == llvm-toolset-13.0" diff --git a/tests/ld-alternative/main.fmf b/tests/ld-alternative/main.fmf index af040ae..7144ea1 100644 --- a/tests/ld-alternative/main.fmf +++ b/tests/ld-alternative/main.fmf @@ -1,8 +1,17 @@ summary: Test linker switching with alternatives -test: ./test.sh +test: "$WITH_SCL ./test.sh" # This test spoils the installation by removing lld, therefore it should be marked as such. tag: - spoils-installation require: - - lld - binutils +adjust: + # Common requirements when LLVM is not SCL-ized + - require+: + - lld + when: "collection is not defined" + + # Requirements for SCL-ized LLVM + - require+: + - llvm-toolset-13.0-lld + when: "collection == llvm-toolset-13.0" diff --git a/tests/lit-tests/main.fmf b/tests/lit-tests/main.fmf index 599dee4..2614d0e 100644 --- a/tests/lit-tests/main.fmf +++ b/tests/lit-tests/main.fmf @@ -1,6 +1,16 @@ summary: Run lld testsuite -test: ./test.sh +test: "$WITH_SCL ./test.sh" duration: 30m -require: - - lld - - lld-test +require: [] +adjust: + # Common requirements when LLVM is not SCL-ized + - require+: + - lld + - lld-test + when: "collection is not defined" + + # Requirements for SCL-ized LLVM + - require+: + - llvm-toolset-13.0-lld + - llvm-toolset-13.0-lld-test + when: "collection == llvm-toolset-13.0"