[petsc] 01/02: New patch test_mpi_conditional_bug816101 disables MPI test of ex19

[Drew Parsons]

This is an automated email from the git hooks/post-receive script.

dparsons pushed a commit to tag debian/3.6.3.dfsg2-5
in repository petsc.

commit d7a5269cc76c4eaa6fd83baa356a0b1595081eb7
Author: Drew Parsons <dparsons at debian.org>
Date:   Mon Apr 25 00:28:30 2016 +0800

    New patch test_mpi_conditional_bug816101 disables MPI test of ex19
    
    New patch test_mpi_conditional_bug816101 disables test of ex19 on
    2 MPI processes on mipsel and powerpc, working around intermittent
    timeouts, Closes: #816101.
    
    On mipsel, and occasionally on powerpc, the build hangs at the
    2-process MPI test of ex19 in the standard real (not debug) build.
    Presumeably the program is caught in a deadlock.
    
    This patch is intended only as a workaround for this problem, not a
    permanent fix. Test again without this patch once #818909 is fully
    closed.
---
 debian/changelog                              |  8 ++++++++
 debian/patches/series                         |  1 +
 debian/patches/test_mpi_conditional_bug816101 | 20 ++++++++++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 092a902..58591a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+petsc (3.6.3.dfsg2-5) UNRELEASED; urgency=medium
+
+  * New patch test_mpi_conditional_bug816101 disables test of ex19 on
+    2 MPI processes on mipsel and powerpc, working around intermittent
+    timeouts. Closes: #816101.
+
+ -- Drew Parsons <dparsons at debian.org>  Mon, 25 Apr 2016 00:13:11 +0800
+
 petsc (3.6.3.dfsg2-4.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/patches/series b/debian/patches/series
index 406df48..83ae0e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ python_header
 soname_extension
 install_python_RDict_upstream_5a4feeed41cb1af9234d439bb06ea004d3cfa5c6
 hurd.patch
+test_mpi_conditional_bug816101
diff --git a/debian/patches/test_mpi_conditional_bug816101 b/debian/patches/test_mpi_conditional_bug816101
new file mode 100644
index 0000000..e913ae1
--- /dev/null
+++ b/debian/patches/test_mpi_conditional_bug816101
@@ -0,0 +1,20 @@
+Index: petsc/src/snes/examples/tutorials/makefile
+===================================================================
+--- petsc.orig/src/snes/examples/tutorials/makefile
++++ petsc/src/snes/examples/tutorials/makefile
+@@ -916,7 +916,14 @@ testex19: ex19.PETSc
+ 	   else echo "Possible error running C/C++ src/snes/examples/tutorials/ex19 with 1 MPI process"; \
+            echo "See http://www.mcs.anl.gov/petsc/documentation/faq.html";\
+            cat ex19_1.tmp; fi; \
+-	if [ "${MPIEXEC}" != "${PETSC_DIR}/bin/petsc-mpiexec.uni" ]; then \
++	TEST_BUILD_ARCH=$(shell dpkg-architecture -q DEB_BUILD_ARCH); \
++	if [ "$$TEST_BUILD_ARCH" = "mipsel" -o "$$TEST_BUILD_ARCH" = "powerpc" ]; then \
++	   echo "test of ex19 for 2 MPI processes is disabled on mipsel and powerpc (see Debian Bug#816101)"; \
++	   MPI_SAFE="notsafe"; \
++	else \
++	   MPI_SAFE="safe"; \
++	fi; \
++	if [ $${MPI_SAFE} = "safe" -a "${MPIEXEC}" != "${PETSC_DIR}/bin/petsc-mpiexec.uni" ]; then \
+            ${MPIEXEC} -n 2 ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres  > ex19_1.tmp 2>&1; \
+ 	   if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \
+            echo "C/C++ example src/snes/examples/tutorials/ex19 run successfully with 2 MPI processes"; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/petsc.git