PR#158: tests: fix lld unavailability in ppc64 for toolchains tests - rpms/clang

Jesus Checa Hidalgo • 2 years ago

4ae8585

tests/toolchains/main.fmf

file modified

+6 -7

		`@@ -13,9 +13,6 @@`
		`- compiler-rt`
		`- lld`
		`when: "collection is not defined"`
		`- - require-:`
		`- - lld`
		`- when: collection is not defined and arch == s390x`

		`# Requirements for SCL-ized LLVM`
		`- require+:`
		`@@ -23,17 +20,19 @@`
		`- llvm-toolset-13.0-compiler-rt`
		`- llvm-toolset-13.0-lld`
		`when: "collection == llvm-toolset-13.0"`
		`- - require-:`
		`- - llvm-toolset-13.0-lld`
		`- when: collection == llvm-toolset-13.0 and arch == s390x`
		`- require+:`
		`- llvm-toolset-14.0-clang`
		`- llvm-toolset-14.0-compiler-rt`
		`- llvm-toolset-14.0-lld`
		`when: "collection == llvm-toolset-14.0"`
		`+`
		`+ # lld not supported in s390x or ppc64. If any lld package was added to`
		`+ # requirements, remove it.`
		`- require-:`
		`+ - lld`
		`+ - llvm-toolset-13.0-lld`
		`- llvm-toolset-14.0-lld`
		`- when: collection == llvm-toolset-14.0 and arch == s390x`
		`+ when: arch == s390x or arch == ppc64`

		`- environment+:`
		`CXXLIBS: "libc++"`

tests/toolchains/test.sh

file modified

+4 -2

		`@@ -80,8 +80,10 @@`
		`args="$args -pthread"`
		`fi`

		`- # lld is not supported in s390x`
		`- if [[ "$(uname -m)" = "s390x" && "$linker" = "lld" ]]; then`
		`+ # lld is not supported in s390x and ppc64`
		`+ if [[ "$(uname -m)" = "s390x" \|\| "$(uname -m)" = "ppc64" ]] \`
		`+ && [[ "$linker" = "lld" ]];`
		`+ then`
		`continue`
		`fi`