Compare commits

..

1 commit

Author SHA1 Message Date
Jesus Checa Hidalgo
15fec8fe6d Create compat18 branch 2024-07-16 14:09:16 +02:00
5 changed files with 11 additions and 14 deletions

View file

@ -12,10 +12,3 @@ repos:
rev: 1.32.2 rev: 1.32.2
hooks: hooks:
- id: tmt-lint - id: tmt-lint
- repo: https://github.com/koalaman/shellcheck-precommit
rev: v0.10.0
hooks:
- id: shellcheck
require_serial: true # Podman has trouble running concurrently
args: ["--exclude=SC1091"] # Ignore "Not following" sourced scripts

View file

@ -7,7 +7,7 @@ extra-nitrate: TC#0614058
adjust+: adjust+:
# Common requirements when LLVM is not SCL-ized # Common requirements when LLVM is not SCL-ized
- require+: - require+:
- clang - clang18
when: collection is not defined when: collection is not defined
# Requirements for SCL-ized LLVM # Requirements for SCL-ized LLVM

View file

@ -13,3 +13,7 @@ adjust+:
- because: lld is not installed as ld alternative in rhel < 9 - because: lld is not installed as ld alternative in rhel < 9
enabled: false enabled: false
when: distro < rhel-9 when: distro < rhel-9
- because: lld not installed as alternative in compat packages
enabled: false
when: compat is defined

View file

@ -1,11 +1,11 @@
#!/bin/bash -eux #!/bin/sh -eux
# This test assumes lld is already installed. # This test assumes lld is already installed.
verify_ld_bfd (){ function verify_ld_bfd {
# Verify that /usr/bin/ld points to ld.bfd. # Verify that /usr/bin/ld points to ld.bfd.
[[ $(readlink -f /etc/alternatives/ld) == *"ld.bfd" ]] ls -l /etc/alternatives/ld | grep ld.bfd
# Run ld and verify it invokes ld.bfd # Run ld and verify it invokes ld.bfd
/usr/bin/ld --version | grep 'GNU ld' /usr/bin/ld --version | grep 'GNU ld'
@ -19,7 +19,7 @@ verify_ld_bfd
update-alternatives --set ld /usr/bin/ld.lld update-alternatives --set ld /usr/bin/ld.lld
# Verify that /usr/bin/ld points to lld # Verify that /usr/bin/ld points to lld
[[ $(readlink -f /etc/alternatives/ld) == *"lld" ]] ls -l /etc/alternatives/ld | grep ld.lld
# Run ld and verify it invokes lld # Run ld and verify it invokes lld
/usr/bin/ld --version | grep 'LLD' /usr/bin/ld --version | grep 'LLD'

View file

@ -14,7 +14,7 @@ framework: shell
# Always define "test" key and override in adjust or in each specific test # Always define "test" key and override in adjust or in each specific test
# metadata if needed. # metadata if needed.
test: ./test.sh test: "PATH=/usr/lib64/llvm18/bin:$PATH ./test.sh"
# Commonly used keys are initialized to empty. # Commonly used keys are initialized to empty.
require: [] require: []
@ -34,7 +34,7 @@ adjust+:
# Common requirements when LLVM is not SCL-ized # Common requirements when LLVM is not SCL-ized
- require+: - require+:
- lld - lld18
when: collection is not defined when: collection is not defined
# Requirements for SCL-ized LLVM # Requirements for SCL-ized LLVM