commit: 912b10968c6144fde85b127386ad9cb58c5f0db2 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jun 21 06:17:31 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jun 21 06:17:50 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=912b1096
dev-util/spirv-tools: unrestrict tests Just skip the (potentially) flaky tests, though they passed for me. Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/spirv-tools/spirv-tools-1.4.313.0.ebuild | 18 +++++++++++++++--- dev-util/spirv-tools/spirv-tools-9999.ebuild | 20 ++++++++++++++++---- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/dev-util/spirv-tools/spirv-tools-1.4.313.0.ebuild b/dev-util/spirv-tools/spirv-tools-1.4.313.0.ebuild index 7fa029587a3f..b5c061ec7fb0 100644 --- a/dev-util/spirv-tools/spirv-tools-1.4.313.0.ebuild +++ b/dev-util/spirv-tools/spirv-tools-1.4.313.0.ebuild @@ -23,9 +23,8 @@ HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"; LICENSE="Apache-2.0" SLOT="0" -# Tests fail upon finding symbols that do not match a regular expression -# in the generated library. Easily hit with non-standard compiler flags -RESTRICT="test" +IUSE="test" +RESTRICT="!test? ( test )" DEPEND="~dev-util/spirv-headers-${PV}" # RDEPEND="" @@ -35,6 +34,7 @@ multilib_src_configure() { local mycmakeargs=( -DSPIRV-Headers_SOURCE_DIR="${ESYSROOT}"/usr/ -DSPIRV_WERROR=OFF + -DSPIRV_SKIP_TESTS=$(usex !test) -DSPIRV_TOOLS_BUILD_STATIC=OFF -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" @@ -42,3 +42,15 @@ multilib_src_configure() { cmake_src_configure } + +src_test() { + CMAKE_SKIP_TESTS=( + # Not relevant for us downstream + spirv-tools-copyrights + # Tests fail upon finding symbols that do not match a regular expression + # in the generated library. Easily hit with non-standard compiler flags + spirv-tools-symbol-exports.* + ) + + multilib-minimal_src_test +} diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild index 04066f14f80d..2cc7b4c559a2 100644 --- a/dev-util/spirv-tools/spirv-tools-9999.ebuild +++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then else EGIT_COMMIT="vulkan-sdk-${PV}" SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT} fi @@ -23,9 +23,8 @@ HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"; LICENSE="Apache-2.0" SLOT="0" -# Tests fail upon finding symbols that do not match a regular expression -# in the generated library. Easily hit with non-standard compiler flags -RESTRICT="test" +IUSE="test" +RESTRICT="!test? ( test )" DEPEND="~dev-util/spirv-headers-${PV}" # RDEPEND="" @@ -35,6 +34,7 @@ multilib_src_configure() { local mycmakeargs=( -DSPIRV-Headers_SOURCE_DIR="${ESYSROOT}"/usr/ -DSPIRV_WERROR=OFF + -DSPIRV_SKIP_TESTS=$(usex !test) -DSPIRV_TOOLS_BUILD_STATIC=OFF -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" @@ -42,3 +42,15 @@ multilib_src_configure() { cmake_src_configure } + +src_test() { + CMAKE_SKIP_TESTS=( + # Not relevant for us downstream + spirv-tools-copyrights + # Tests fail upon finding symbols that do not match a regular expression + # in the generated library. Easily hit with non-standard compiler flags + spirv-tools-symbol-exports.* + ) + + multilib-minimal_src_test +}
