From f1daf5c5418b226dceec745f9ba2f82d8c03f97d52d14ee62b084fa99afc9c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 6 Sep 2016 08:00:40 +0000 Subject: [PATCH 1/2] Accepting request 424827 from home:michel_mno:branches:science - temporarily disable mpi test for ppc64le OBS-URL: https://build.opensuse.org/request/show/424827 OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=33 --- hdf5.changes | 5 +++++ hdf5.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/hdf5.changes b/hdf5.changes index 95d7d23..b1364d2 100644 --- a/hdf5.changes +++ b/hdf5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 5 11:00:59 UTC 2016 - normand@linux.vnet.ibm.com + +- temporarily disable mpi test for ppc64le + ------------------------------------------------------------------- Tue Jul 26 15:50:22 UTC 2016 - adrian@suse.de diff --git a/hdf5.spec b/hdf5.spec index d4e6e97..b9c6b4a 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -887,10 +887,13 @@ 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 From 5a0a6665e474d71e633e4451a6f7d4c4cabab1ddafd0ea894700d462344bcbde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 8 Sep 2016 10:26:29 +0000 Subject: [PATCH 2/2] Accepting request 424930 from home:michel_mno:branches:science - 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 --- hdf5.changes | 7 +++++++ hdf5.spec | 6 ++---- hdf5_disable_testphdf5.patch | 39 ++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 hdf5_disable_testphdf5.patch diff --git a/hdf5.changes b/hdf5.changes index b1364d2..e164dda 100644 --- a/hdf5.changes +++ b/hdf5.changes @@ -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 diff --git a/hdf5.spec b/hdf5.spec index b9c6b4a..081809d 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -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 diff --git a/hdf5_disable_testphdf5.patch b/hdf5_disable_testphdf5.patch new file mode 100644 index 0000000..ab55d4a --- /dev/null +++ b/hdf5_disable_testphdf5.patch @@ -0,0 +1,39 @@ +From: Michel Normand +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 +--- + 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} $) +- + foreach (testp ${H5P_TESTS}) + add_test (NAME TEST_PAR_${testp} COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $) + 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