[scalapack] 01/02: debian/rules: when testing, ignore Timeout and fail only on true Fails

[Drew Parsons]

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

dparsons pushed a commit to tag experimental/2.0.2-1exp3
in repository scalapack.

commit 3d2bea648ae6df1038aba32a7eae8c7b67fc33a3
Author: Drew Parsons <dparsons at debian.org>
Date:   Wed Jul 19 16:46:09 2017 +0800

    debian/rules: when testing, ignore Timeout and fail only on true Fails
    
    On slower arches, some openmpi tests will Timeout (e.g. 43-45, 91-94),
    which registers as a fail, halting the build.
    
    For instance, building on armel with
       dh_auto_test --builddirectory=build-openmpi -- ARGS+="--timeout 20000"
    we find that test 94 (xzheevr) takes 16467 sec. Standard timeout is 1500s.
    
    It's not constructive to use a 20000 sec timeout, so instead ignore
    Timeout results in tests.  Only fail (return value 2) on a true Failed
    openmpi test.
    
    Also, log mpich tests but do not test for failure (many mpich tests
    already fail).
---
 debian/changelog |  8 ++++++++
 debian/rules     | 19 ++++++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 50cb8a8..2a0cde3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+scalapack (2.0.2-1exp3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * debian/rules: when testing, ignore Timeout and fail only on true
+    Failed results in openmpi. Log mpich tests but ignore mpich Fails.
+
+ -- Drew Parsons <dparsons at debian.org>  Wed, 19 Jul 2017 16:32:47 +0800
+
 scalapack (2.0.2-1exp2) experimental; urgency=medium
 
   * Team upload.
diff --git a/debian/rules b/debian/rules
index 841de62..8388a1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,9 +52,18 @@ override_dh_auto_install:
 # add --max-parallel=1 to force test in sequential mode
 # MPICH testsuite disabled as some tests fail -- why???
 override_dh_auto_test:
-	MPIEXEC="mpiexec --allow-run-as-root --oversubscribe -np " dh_auto_test --builddirectory=build-openmpi
-	# for flavor in openmpi mpich; do \
-	#   echo "Running tests for libscalapack-$$flavor" ; \
-	#   MPIEXEC="mpiexec.$$flavor --allow-run-as-root --oversubscribe -np " dh_auto_test --builddirectory=build-$$flavor ; \
-	# done
+	for flavor in openmpi mpich; do \
+	  echo "Running tests for libscalapack-$$flavor" ; \
+	  MPIEXEC="mpiexec.$$flavor --allow-run-as-root --oversubscribe -np " dh_auto_test --builddirectory=build-$$flavor >build-$$flavor/dh_auto_test.log 2>&1 || /bin/true; \
+	  echo '************************************************'; \
+	  echo "****** TESTING $$flavor BUILD"; \
+	  echo '************************************************'; \
+	  cat build-$$flavor/dh_auto_test.log; \
+	  echo '************************************************'; \
+	  echo "****** TESTING OF $$flavor BUILD IS COMPLETE"; \
+	  echo '************************************************'; \
+	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 return 2; fi
 

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