commit: accc5913ecec56a632df33ec805848273e234ca0
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 6 05:49:28 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Oct 6 05:50:20 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=accc5913
sci-libs/flexiblas: Use explicit skips for CBLAS tests on mkl
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-libs/flexiblas/flexiblas-3.4.82-r4.ebuild | 16 ++++------------
sci-libs/flexiblas/flexiblas-9999.ebuild | 16 ++++------------
2 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/sci-libs/flexiblas/flexiblas-3.4.82-r4.ebuild
b/sci-libs/flexiblas/flexiblas-3.4.82-r4.ebuild
index 51b77796acdc..6b53fa3ec3e5 100644
--- a/sci-libs/flexiblas/flexiblas-3.4.82-r4.ebuild
+++ b/sci-libs/flexiblas/flexiblas-3.4.82-r4.ebuild
@@ -189,30 +189,22 @@ my_test() {
local -x OMP_NUM_THREADS=1
local -x OPENBLAS_NUM_THREADS=1
- local failures=()
local backend
for backend in "${@}"; do
- # TODO: remove this, and XFAIL them properly when cmake.eclass
- # is fixed to respect nonfatal, https://bugs.gentoo.org/961929
+ local args=()
if [[ ${backend} == Mkl* ]]; then
- einfo "Skipping ${backend} tests, XFAIL"
- continue
+ # XFAIL
+ args+=( -E 'cblat[23]' )
fi
local -x FLEXIBLAS_TEST=${backend}
local log=${BUILD_DIR}/Testing/Temporary/LastTest.log
einfo "Testing backend ${backend}"
- if ! nonfatal cmake_src_test; then
- failures+=( "${backend}" )
- fi
+ cmake_src_test "${args[@]}"
if grep -q 'BLAS backend .* not found' "${log}"; then
die "Backend ${backend} failed to load while testing,
see ${log}"
fi
done
-
- if [[ ${failures[@]} ]]; then
- die "Test runs failed for backends: ${failures[*]}"
- fi
}
src_test() {
diff --git a/sci-libs/flexiblas/flexiblas-9999.ebuild
b/sci-libs/flexiblas/flexiblas-9999.ebuild
index 9aff3ceea439..0ac6f842b5de 100644
--- a/sci-libs/flexiblas/flexiblas-9999.ebuild
+++ b/sci-libs/flexiblas/flexiblas-9999.ebuild
@@ -180,30 +180,22 @@ my_test() {
local -x OMP_NUM_THREADS=1
local -x OPENBLAS_NUM_THREADS=1
- local failures=()
local backend
for backend in "${@}"; do
- # TODO: remove this, and XFAIL them properly when cmake.eclass
- # is fixed to respect nonfatal, https://bugs.gentoo.org/961929
+ local args=()
if [[ ${backend} == Mkl* ]]; then
- einfo "Skipping ${backend} tests, XFAIL"
- continue
+ # XFAIL
+ args+=( -E 'cblat[23]' )
fi
local -x FLEXIBLAS_TEST=${backend}
local log=${BUILD_DIR}/Testing/Temporary/LastTest.log
einfo "Testing backend ${backend}"
- if ! nonfatal cmake_src_test; then
- failures+=( "${backend}" )
- fi
+ cmake_src_test "${args[@]}"
if grep -q 'BLAS backend .* not found' "${log}"; then
die "Backend ${backend} failed to load while testing,
see ${log}"
fi
done
-
- if [[ ${failures[@]} ]]; then
- die "Test runs failed for backends: ${failures[*]}"
- fi
}
src_test() {
