commit: ab742fb45261c9c6214f31e08cdb35eee83efe2e
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 16 22:11:40 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Jul 16 22:16:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab742fb4
media-libs/openexr: keyword 2.5.7 for ~riscv
On a BeagleV Starlight, IlmImfTest times out by default - but with the
time-out threshold increased from the default 1500 s to 1.5 h, tests
pass.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch | 13 +++++++++++++
media-libs/openexr/openexr-2.5.7.ebuild | 8 +++++++-
profiles/arch/riscv/package.use.mask | 6 ------
3 files changed, 20 insertions(+), 7 deletions(-)
diff --git
a/media-libs/openexr/files/openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch
b/media-libs/openexr/files/openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch
new file mode 100644
index 00000000000..ef71bc0e687
--- /dev/null
+++
b/media-libs/openexr/files/openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch
@@ -0,0 +1,13 @@
+This consists of A LOT of individual tests and on some hardware
+(e.g. the RISC-V board BeagleV Starlight) the default test time-out
+of 1500 seconds is greatly insufficient. On said BeagleV OpenEXR.IlmImf
+takes almost 4800 s even on an otherwise idle system so let's add a bit
+of margin and set the time-out of this test to 1.5 hours.
+
+--- a/IlmImfTest/CMakeLists.txt 2021-06-15 00:15:14.000000000 +0000
++++ b/IlmImfTest/CMakeLists.txt 2021-07-16 16:51:20.600435829 +0000
+@@ -73,3 +73,4 @@
+ target_compile_definitions(IlmImfTest PRIVATE OPENEXR_DLL)
+ endif()
+ add_test(NAME OpenEXR.IlmImf COMMAND $<TARGET_FILE:IlmImfTest>)
++set_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT 5400)
diff --git a/media-libs/openexr/openexr-2.5.7.ebuild
b/media-libs/openexr/openexr-2.5.7.ebuild
index d94729d81f2..8a5f1c968b2 100644
--- a/media-libs/openexr/openexr-2.5.7.ebuild
+++ b/media-libs/openexr/openexr-2.5.7.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P}/OpenEXR"
LICENSE="BSD"
SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux
~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
RESTRICT="!test? ( test )"
@@ -36,6 +36,12 @@ src_prepare() {
eapply
"${FILESDIR}/${PN}-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch"
fi
+ # Technically this doesn't disable anything, it just gives this
test time to complete.
+ # Could probably be applied unconditionally but will leave this
to the maintainers.
+ if use riscv; then
+ eapply
"${FILESDIR}/${P}-0002-increase-IlmImfTest-timeout.patch"
+ fi
+
if use sparc; then
eapply
"${FILESDIR}/${P}-0001-disable-testRgba-on-sparc.patch"
fi
diff --git a/profiles/arch/riscv/package.use.mask
b/profiles/arch/riscv/package.use.mask
index 4140a2b47de..eca3ce4ba37 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -52,12 +52,6 @@ sys-cluster/openmpi openmpi_fabrics_ofed
openmpi_fabrics_knem openmpi_fabrics_ps
# - sci-libs/hdf5, sys-fabric/ofed, dev-db/mariadb | dev-db/mysql
sys-cluster/slurm hdf5 ofed slurmdbd
-# Ye Cao <[email protected]> (2021-06-24)
-# media-libs/openexr not keyworded yet - it compiles fine but the its test
-# suite times out, even with the time limit increased from 1500 to 3600 s.
-# Needs more work.
-media-gfx/imagemagick openexr
-
# Yixun Lan <[email protected]> (2021-05-24)
# Dependencies not keyworded, not tested
dev-libs/libdbusmenu test
