From 15fec8fe6d25c0a42c1a66ac3615b6b324311196 Mon Sep 17 00:00:00 2001 From: Jesus Checa Hidalgo Date: Tue, 16 Jul 2024 14:09:16 +0200 Subject: [PATCH] Create compat18 branch --- tests/basic/main.fmf | 2 +- tests/ld-alternative/main.fmf | 4 ++++ tests/main.fmf | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/basic/main.fmf b/tests/basic/main.fmf index 65613c8..508169a 100644 --- a/tests/basic/main.fmf +++ b/tests/basic/main.fmf @@ -7,7 +7,7 @@ extra-nitrate: TC#0614058 adjust+: # Common requirements when LLVM is not SCL-ized - require+: - - clang + - clang18 when: collection is not defined # Requirements for SCL-ized LLVM diff --git a/tests/ld-alternative/main.fmf b/tests/ld-alternative/main.fmf index 591d028..e0a90f1 100644 --- a/tests/ld-alternative/main.fmf +++ b/tests/ld-alternative/main.fmf @@ -13,3 +13,7 @@ adjust+: - because: lld is not installed as ld alternative in rhel < 9 enabled: false when: distro < rhel-9 + + - because: lld not installed as alternative in compat packages + enabled: false + when: compat is defined diff --git a/tests/main.fmf b/tests/main.fmf index fb4e6a1..fd78e34 100644 --- a/tests/main.fmf +++ b/tests/main.fmf @@ -14,7 +14,7 @@ framework: shell # Always define "test" key and override in adjust or in each specific test # metadata if needed. -test: ./test.sh +test: "PATH=/usr/lib64/llvm18/bin:$PATH ./test.sh" # Commonly used keys are initialized to empty. require: [] @@ -34,7 +34,7 @@ adjust+: # Common requirements when LLVM is not SCL-ized - require+: - - lld + - lld18 when: collection is not defined # Requirements for SCL-ized LLVM