From a46d4d90b996717f4559d889b67b1a1ecd13dbdc1423cb1600935c85d9e9c52a Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 25 Nov 2019 08:43:39 +0000 Subject: [PATCH] Accepting request 750562 from home:StefanBruens:branches:graphics - Fix build with older cmake package (Leap 15.0 up to 15.2), the included ctest macro does not accept extra parameters. OBS-URL: https://build.opensuse.org/request/show/750562 OBS-URL: https://build.opensuse.org/package/show/graphics/openexr?expand=0&rev=43 --- openexr.changes | 6 ++++++ openexr.spec | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/openexr.changes b/openexr.changes index 51e2cdc..00aee36 100644 --- a/openexr.changes +++ b/openexr.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Nov 24 13:47:08 UTC 2019 - Stefan BrĂ¼ns + +- Fix build with older cmake package (Leap 15.0 up to 15.2), the + included ctest macro does not accept extra parameters. + ------------------------------------------------------------------- Thu Nov 14 17:57:37 UTC 2019 - Christophe Giboudeaux diff --git a/openexr.spec b/openexr.spec index 49757a0..1816c20 100644 --- a/openexr.spec +++ b/openexr.spec @@ -149,10 +149,15 @@ popd %check %ifarch x86_64 pushd OpenEXR -# tests takes LOONG, e. g. 20 min, in obs even more that -# exceed timeout limit 25 min export LD_LIBRARY_PATH="$PWD/build/IlmImf:$PWD/build/IlmImfUtil:$LD_LIBRARY_PATH" -%ctest --timeout 3000 +# tests can take longer than the default timeout of 25 minutes +%if 0%{?suse_version} < 1550 +# HACK - older versions of the ctest macro do not allow passing additional parameters +%global __ctest %{__ctest} --timeout 3600 +%ctest +%else +%ctest --timeout 3600 +%endif popd %endif