pool/hdf5
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 424930 from home:michel_mno:branches:science

Browse Source 
-  new hdf5_disable_testphdf5.patch to disable only testphdf5
   for all arches and not all mpi tests for ppc64le
   tempo patch as long as boo#997252 not solved

OBS-URL: https://build.opensuse.org/request/show/424930
OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=34
This commit is contained in:
Ismail Dönmez 2016-09-08 10:26:29 +00:00 committed by Git OBS Bridge
parent f1daf5c541
commit 5a0a6665e4
3 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hdf5.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Sep 6 08:51:09 UTC 2016 - normand@linux.vnet.ibm.com
- new hdf5_disable_testphdf5.patch to disable only testphdf5
for all arches and not all mpi tests for ppc64le
tempo patch as long as boo#997252 not solved
-------------------------------------------------------------------
Mon Sep 5 11:00:59 UTC 2016 - normand@linux.vnet.ibm.com

6
hdf5.spec
View File

@ -58,6 +58,7 @@ Patch4: hdf5-1.8.10-tests-arm.patch
Patch5: hdf5-ldouble-ppc64le.patch
Patch6: hdf5-buildcompare.patch
Patch7: hdf5-mpi.patch
Patch8: hdf5_disable_testphdf5.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: fdupes
BuildRequires: gcc-c++
@ -777,6 +778,7 @@ This package provides examples of HDF5 library use.
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
echo "prepare parallel builds: %_mpi"
for build_dir in build %_mpi; do
@ -886,14 +888,10 @@ EOF
export HDF5_ALARM_SECONDS=3600
%endif
make -C build check
# ignore errors for parallel builds
# testphdf5 is hanging on ppc64le with openmpi
%ifnarch ppc64le
export HDF5_Make_Ignore=yes
for mpi in %_mpi; do
make -C $mpi check
done
%endif
%post -n libhdf5-%{sonum} -p /sbin/ldconfig
%postun -n libhdf5-%{sonum} -p /sbin/ldconfig

39
hdf5_disable_testphdf5.patch Normal file
View File

@ -0,0 +1,39 @@
From: Michel Normand <normand@linux.vnet.ibm.com>
Subject: hdf5 disable testphdf5
Date: Tue, 06 Sep 2016 10:55:48 +0200
hdf5 disable testphdf5 temporarily as long as bug not solved
https://bugzilla.suse.com/show_bug.cgi?id=997252
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
---
testpar/CMakeTests.cmake | 2 --
testpar/Makefile.in | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
Index: hdf5-1.10.0-patch1/testpar/CMakeTests.cmake
===================================================================
--- hdf5-1.10.0-patch1.orig/testpar/CMakeTests.cmake
+++ hdf5-1.10.0-patch1/testpar/CMakeTests.cmake
@@ -5,8 +5,6 @@
##############################################################################
##############################################################################
-add_test (NAME TEST_PAR_testphdf5 COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:testphdf5>)
-
foreach (testp ${H5P_TESTS})
add_test (NAME TEST_PAR_${testp} COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:${testp}>)
endforeach (testp ${H5P_TESTS})
Index: hdf5-1.10.0-patch1/testpar/Makefile.in
===================================================================
--- hdf5-1.10.0-patch1.orig/testpar/Makefile.in
+++ hdf5-1.10.0-patch1/testpar/Makefile.in
@@ -771,7 +771,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.c
# Test programs. These are our main targets.
#
-TEST_PROG_PARA = t_mpi testphdf5 t_cache t_pflush1 t_pflush2 t_pshutdown t_prestart t_init_term t_shapesame
+TEST_PROG_PARA = t_mpi t_cache t_pflush1 t_pflush2 t_pshutdown t_prestart t_init_term t_shapesame
testphdf5_SOURCES = testphdf5.c t_dset.c t_file.c t_file_image.c t_mdset.c \
t_ph5basic.c t_coll_chunk.c t_span_tree.c t_chunk_alloc.c t_filter_read.c \
t_prop.c