[scalapack] 01/01: only check openmpi test Fails on linux

[Drew Parsons]

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

dparsons pushed a commit to branch experimental
in repository scalapack.

commit f09352102183b7a11483ce16a4466551108edeee
Author: Drew Parsons <dparsons at debian.org>
Date:   Mon Aug 7 16:07:05 2017 +0800

    only check openmpi test Fails on linux
    
    since openmpi doesn't support fakeroot usage on kfreebsd or hurd.
    e.g. hurd build:
    
     3/96 Test  #3: spb1tst ..........................***Failed    2.18 sec
    [mahler:06614] PMIX ERROR: INIT in file src/dstore/pmix_esh.c at line 839
    [mahler:06614] PMIX ERROR: ERROR in file src/dstore/pmix_esh.c at line 1468
    [mahler:06614] PMIX ERROR: ERROR in file src/server/pmix_server.c at line 592
    [mahler:06614] PMIX ERROR: NOT-SUPPORTED in file src/server/pmix_server_listener.c at line 540
    [mahler:06618] PMIX ERROR: UNREACHABLE in file src/client/pmix_client.c at line 1017
    [mahler:06618] PMIX ERROR: UNREACHABLE in file src/client/pmix_client.c at line 205
---
 debian/changelog | 8 ++++++++
 debian/rules     | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8e120af..236e600 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+scalapack (2.0.2-1exp6) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Only check openmpi test Fails on linux,
+    since openmpi doesn't support fakeroot usage on kfreebsd or hurd.
+
+ -- Drew Parsons <dparsons at debian.org>  Mon, 07 Aug 2017 16:04:14 +0800
+
 scalapack (2.0.2-1exp5) experimental; urgency=medium
 
   * Team upload.
diff --git a/debian/rules b/debian/rules
index 20fbf2f..efd354c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,7 @@ export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
 export DEB_CXXFLAGS_MAINT_APPEND  = -Wall -pedantic
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 export DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+export DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
 
 ifneq (,$(wildcard /usr/share/mpi-default-dev/debian_defaults))
 include /usr/share/mpi-default-dev/debian_defaults 
@@ -72,7 +73,8 @@ override_dh_auto_test:
 	done
 	# mpich has been found to Fail some tests but openmpi should not, so only check the openmpi test logs.
 	# openmpi may Timeout on slower arches, so only register actual Fails, assigning them return value 2
-	if $$( grep -q Failed build-openmpi/dh_auto_test.log ); then \
+	# Test only on linux, since openmpi on other OS (kfreebsd, hurd) does not support fakeroot
+	if [[ "$$DEB_BUILD_ARCH_OS" = "linux" ]] && $$( grep -q Failed build-openmpi/dh_auto_test.log ); then \
 	  echo "OpenMPI tests failed:"; \
 	  grep Failed build-openmpi/dh_auto_test.log; \
 	  return 2; \

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