Attachment 920517 Details for Bug 1122911 – Patch

[patch] Patch

0001-Enabled-tests-on-s390.patch (text/plain), 1.93 KB, created by Jakub Čajka on 2014-07-24 11:39:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Čajka

Created: 2014-07-24 11:39:05 UTC

Size: 1.93 KB

patch

obsolete

>From 8236bb445e174a16c3812828435a8c86f917d9bf Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
>Date: Thu, 24 Jul 2014 13:25:50 +0200
>Subject: [PATCH] Enabled tests on s390 Disabled parallel tests on s390(x)
>
>---
> netcdf.spec | 19 ++++++++++++++++---
> 1 file changed, 16 insertions(+), 3 deletions(-)
>
>diff --git a/netcdf.spec b/netcdf.spec
>index a918cf6..ae8fee1 100644
>--- a/netcdf.spec
>+++ b/netcdf.spec
>@@ -1,6 +1,6 @@
> Name:           netcdf
> Version:        4.3.2
>-Release:        3%{?dist}
>+Release:        4%{?dist}
> Summary:        Libraries for the Unidata network Common Data Form
> 
> Group:          Applications/Engineering
>@@ -218,6 +218,16 @@ do
>   pushd $mpi
>   module load mpi/$mpi-%{_arch}
>   ln -s ../configure .
>+  # parallel tests hang on s390(x)
>+  %ifarch s390 s390x
>+  %configure %{configure_opts} \
>+    --libdir=%{_libdir}/$mpi/lib \
>+    --bindir=%{_libdir}/$mpi/bin \
>+    --sbindir=%{_libdir}/$mpi/sbin \
>+    --includedir=%{_includedir}/$mpi-%{_arch} \
>+    --datarootdir=%{_libdir}/$mpi/share \
>+    --mandir=%{_libdir}/$mpi/share/man 
>+  %else
>   %configure %{configure_opts} \
>     --libdir=%{_libdir}/$mpi/lib \
>     --bindir=%{_libdir}/$mpi/bin \
>@@ -226,6 +236,7 @@ do
>     --datarootdir=%{_libdir}/$mpi/share \
>     --mandir=%{_libdir}/$mpi/share/man \
>     --enable-parallel-tests
>+  %endif
>   make %{?_smp_mflags}
>   module purge
>   popd
>@@ -248,7 +259,6 @@ done
> 
> 
> %check
>-%ifnarch s390
> make -C build check
> # This is hanging here:
> # Testing very simple parallel I/O with 4 processors...
>@@ -259,7 +269,6 @@ do
>   make -C $mpi check
>   module purge
> done
>-%endif
> 
> 
> %post -p /sbin/ldconfig
>@@ -331,6 +340,10 @@ done
> 
> 
> %changelog
>+* Thu Jul 24 2014 Jakub Äajka <jcajka@redhat.com> - 4.3.2-4
>+- Enabled tests on s390
>+- Disabled parallel tests on s390(x) as they hang
>+
> * Mon Jun 9 2014 Orion Poplawski <orion@cora.nwra.com> - 4.3.2-3
> - Rebuild for hdf5 1.8.13, add patch for support
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1122911: 920517 | 920518 | 920524