From 7c149cdecf8681f8ae5e1f331c731f47ac634f7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Prchl=C3=ADk?= Date: Mon, 6 Dec 2021 16:35:43 +0100 Subject: [PATCH] tests: add support for SCL-ized LLVM 13 (llvm-toolset-13.0) --- tests/build-gating.fmf | 22 ++++++++++++++++++---- tests/python-embedded-interpreter/main.fmf | 13 +++++++++++-- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/tests/build-gating.fmf b/tests/build-gating.fmf index c5c9183..aae4ac7 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: lldb 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 rust-toolset-1.58" + when: "collection == llvm-toolset-13.0" + discover: - name: lldb-tests how: fmf @@ -16,10 +34,6 @@ discover: test: integration-test-suite execute: how: tmt -prepare: - - name: packages - how: install - package: lldb provision: hardware: memory: ">= 4 GiB" diff --git a/tests/python-embedded-interpreter/main.fmf b/tests/python-embedded-interpreter/main.fmf index e92273f..273535c 100644 --- a/tests/python-embedded-interpreter/main.fmf +++ b/tests/python-embedded-interpreter/main.fmf @@ -1,5 +1,14 @@ summary: "Test lldb embedded interpreter (rhbz#1567262)" -test: ./test.sh +test: "$WITH_SCL ./test.sh" require: - - lldb - gcc-c++ +adjust: + # Common requirements when LLVM is not SCL-ized + - require+: + - lldb + when: "collection is not defined" + + # Requirements for SCL-ized LLVM + - require+: + - llvm-toolset-13.0-lldb + when: "collection == llvm-toolset-13.0"