From 0abc2b716c61161f7f5a19135f6be5e62ffe422cbe62f47bee82354d678535f4 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Thu, 4 Jul 2019 13:12:53 +0000
Subject: [PATCH] Accepting request 713408 from home:eeich:branches:science

- Since build machine size issues do not seem to go way, make
  the %check stage optional: enable with '--with check'.

OBS-URL: https://build.opensuse.org/request/show/713408
OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=109
---
 hdf5.changes |  6 ++++++
 hdf5.spec    | 20 ++++++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/hdf5.changes b/hdf5.changes
index f7fb7f4..a38738b 100644
--- a/hdf5.changes
+++ b/hdf5.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jul  4 11:45:55 UTC 2019 - Egbert Eich <eich@suse.com>
+
+- Since build machine size issues do not seem to go way, make
+  the %check stage optional: enable with '--with check'.
+
 -------------------------------------------------------------------
 Thu Apr 25 08:51:47 UTC 2019 - Christian Goll <cgoll@suse.com>
 
diff --git a/hdf5.spec b/hdf5.spec
index 378d39a..099be5c 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -28,8 +28,9 @@
 %define DisOMPI3 ExclusiveArch:  do_not_build
 %endif
 
-#
-%define _do_check 1
+# Disable until resource issue is resolved.
+%bcond_with check
+
 %define use_sz2 0
 
 %define vers 1.10.4
@@ -166,11 +167,6 @@ ExclusiveArch:  do_not_build
 ExclusiveArch:  do_not_build
 %endif
 
-# Disable until resource issue is resolved.
-%if "%mpi_flavor" == "openmpi" && 0%{?mpi_vers} == 1
-%define _do_check 0
-%endif
-
 %{?mpi_flavor:%{bcond_without mpi}}%{!?mpi_flavor:%{bcond_with mpi}}
 %{?with_hpc:%{!?compiler_family:%global compiler_family gnu}}
 %{?with_mpi:%{!?mpi_flavor:error "No MPI family specified!"}}
@@ -654,15 +650,15 @@ family "%pname"
 EOF
 %endif
 
-%if 0%{?_do_check}
+%if %{with check}
 %check
-%if 0%{?qemu_user_space_build}
+ %if 0%{?qemu_user_space_build}
 # default timeout is 1200 seconds
 export HDF5_ALARM_SECONDS=3600
-%endif
-%if %{with mpi}
+ %endif
+ %if %{with mpi}
 export HDF5_Make_Ignore=yes
-%endif
+ %endif
 %{?with_hpc:%hpc_setup}
  %ifarch ppc ppc64 ppc64le aarch64
   make %{?_smp_mflags} check || { echo "Ignore transient make check failures for PowerPC or aarch64. boo#1058563"; }