tests: Add all missing requirements for tests/toolchains
This commit is contained in:
parent
8d94b3d903
commit
12f649bbd7
@ -4,21 +4,34 @@ test: "$WITH_SCL ./test.sh"
|
|||||||
require:
|
require:
|
||||||
- glibc-static
|
- glibc-static
|
||||||
- yum-utils
|
- yum-utils
|
||||||
|
# This require EPEL/CRB to be enabled on RHEL
|
||||||
|
- libstdc++-static
|
||||||
adjust:
|
adjust:
|
||||||
# Common requirements when LLVM is not SCL-ized
|
# Common requirements when LLVM is not SCL-ized
|
||||||
- require+:
|
- require+:
|
||||||
- clang
|
- clang
|
||||||
|
- compiler-rt
|
||||||
|
- lld
|
||||||
when: "collection is not defined"
|
when: "collection is not defined"
|
||||||
|
- require-:
|
||||||
|
- lld
|
||||||
|
when: collection is not defined and arch == s390x
|
||||||
|
|
||||||
# Requirements for SCL-ized LLVM
|
# Requirements for SCL-ized LLVM
|
||||||
- require+:
|
- require+:
|
||||||
- llvm-toolset-13.0-clang
|
- llvm-toolset-13.0-clang
|
||||||
|
- llvm-toolset-13.0-compiler-rt
|
||||||
|
- llvm-toolset-13.0-lld
|
||||||
when: "collection == llvm-toolset-13.0"
|
when: "collection == llvm-toolset-13.0"
|
||||||
|
- require-:
|
||||||
|
- llvm-toolset-13.0-lld
|
||||||
|
when: collection == llvm-toolset-13.0 and arch == s390x
|
||||||
|
|
||||||
- environment+:
|
- environment+:
|
||||||
CXXLIBS: "libc++"
|
CXXLIBS: "libc++"
|
||||||
require+:
|
require+:
|
||||||
- libcxx-devel
|
- libcxx-devel
|
||||||
|
- libcxx-static
|
||||||
when: "distro == fedora"
|
when: "distro == fedora"
|
||||||
because: testing against libcxx package in Fedora
|
because: testing against libcxx package in Fedora
|
||||||
|
|
||||||
|
@ -80,6 +80,11 @@ for compiler in clang clang++; do
|
|||||||
args="$args -pthread"
|
args="$args -pthread"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# lld is not supported in s390x
|
||||||
|
if [[ "$(uname -m)" = "s390x" && "$linker" = "lld" ]]; then
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
test_toolchain $compiler $rtlib $linker $cxxlib $args
|
test_toolchain $compiler $rtlib $linker $cxxlib $args
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
Loading…
Reference in New Issue
Block a user