[petsc] 04/06: refresh debian/patches/test_mpi_conditional_bug816101

[Drew Parsons]

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

dparsons pushed a commit to tag experimental/3.7.5+dfsg1-1
in repository petsc.

commit e58bda0548720f3d7b33197a4b700b47dab24ce9
Author: Drew Parsons <dparsons at debian.org>
Date:   Tue Jan 10 19:24:05 2017 +0800

    refresh debian/patches/test_mpi_conditional_bug816101
    
    MPI checks during testing now fail in amd64 chroots (pbuilder) so
    always disable the 2-processor MPI test of ex19.
---
 debian/changelog                              |  3 +++
 debian/patches/test_mpi_conditional_bug816101 | 13 +++----------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c71f23b..0c8d010 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 petsc (3.7.5+dfsg1-1) UNRELEASED; urgency=medium
 
   * New upstream version (patch release).
+    - MPI checks during testing now fail in amd64 chroots so
+      refresh debian/patches/test_mpi_conditional_bug816101
+      to always disable the 2-processor test of ex19.
 
  -- Drew Parsons <dparsons at debian.org>  Tue, 10 Jan 2017 19:17:00 +0800
 
diff --git a/debian/patches/test_mpi_conditional_bug816101 b/debian/patches/test_mpi_conditional_bug816101
index 386e2b6..e5c6fd6 100644
--- a/debian/patches/test_mpi_conditional_bug816101
+++ b/debian/patches/test_mpi_conditional_bug816101
@@ -2,19 +2,12 @@ Index: petsc/src/snes/examples/tutorials/makefile
 ===================================================================
 --- petsc.orig/src/snes/examples/tutorials/makefile
 +++ petsc/src/snes/examples/tutorials/makefile
-@@ -931,7 +931,14 @@ testex19: ex19.PETSc
+@@ -931,7 +931,7 @@ 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 \
+-	if [ ! "${MPI_IS_MPIUNI}" ]; then \
++	if [ ! false && ! "${MPI_IS_MPIUNI}" ]; 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