[scotch] 01/01: skip tests altogether on hurd, m68k

[Drew Parsons]

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

dparsons pushed a commit to branch master
in repository scotch.

commit a2ca2dda6ff9939cc419d695e7c08be979e858bd
Author: Drew Parsons <dparsons at debian.org>
Date:   Mon Nov 27 23:24:47 2017 +0800

    skip tests altogether on hurd, m68k
    
    their timeout and qemu test failures can't simply be ignored. But it
    doesn't necessarily mean they will fail also in the standard runtime
    environment (needs testing on a real hurd or m68k system)
---
 debian/changelog |  4 +++-
 debian/rules     | 13 +++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 821df58..a6f01e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,9 @@ scotch (6.0.4.dfsg1-8) UNRELEASED; urgency=medium
 
   * Team upload.
   * Don't halt on test errors for powerpcspe
-    (may segfault on INTSIZE64)
+    (may segfault on INTSIZE64, but the default INT is still useful)
+  * Skip tests altogether on hurd, m68k (their timeout and qemu test
+    failures can't simply be ignored).
 
  -- Drew Parsons <dparsons at debian.org>  Mon, 27 Nov 2017 22:48:30 +0800
 
diff --git a/debian/rules b/debian/rules
index 77e2db7..ad95379 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,10 +44,13 @@ endif
 # - m68k segfaults inside the qemu emulator used for builds
 # - powerpcspe segfaults on test_scotch_graph_order in INTSIZE64
 # so don't halt on test failures on these arches.
+# In fact don't run tests at all on hurd, m68k.
 ifeq ($(DEB_BUILD_ARCH_OS),hurd)
   HALT_ON_TEST_ERROR = no
+  SKIP_TESTS = yes
 else ifeq ($(DEB_BUILD_ARCH_OS),m68k)
   HALT_ON_TEST_ERROR = no
+  SKIP_TESTS = yes
 else ifeq ($(DEB_BUILD_ARCH_OS),powerpcspe)
   HALT_ON_TEST_ERROR = no
 else
@@ -96,10 +99,12 @@ build-arch-stamp: patch-stamp
 	   (cd src && $(MAKE) scotch ptscotch prefix=$(CURDIR)/$$v); \
 	   (cd src && $(MAKE) esmumps ptesmumps prefix=$(CURDIR)/$$v); \
 	   echo "check for $$v"; \
-	   if [ "x$(HALT_ON_TEST_ERROR)" = "xno" ]; then \
-	     (cd src && LD_LIBRARY_PATH=$(CURDIR)/src/check/../../lib:$(LD_LIBRARY_PATH) $(MAKE) check prefix=$(CURDIR)/$$v) || /bin/true; \
-	   else \
-	     (cd src && LD_LIBRARY_PATH=$(CURDIR)/src/check/../../lib:$(LD_LIBRARY_PATH) $(MAKE) check prefix=$(CURDIR)/$$v); \
+	   if [ "x$(SKIP_TESTS)" != "xyes" ]; then \
+	     if [ "x$(HALT_ON_TEST_ERROR)" = "xno" ]; then \
+	       (cd src && LD_LIBRARY_PATH=$(CURDIR)/src/check/../../lib:$(LD_LIBRARY_PATH) $(MAKE) check prefix=$(CURDIR)/$$v) || /bin/true; \
+	     else \
+	       (cd src && LD_LIBRARY_PATH=$(CURDIR)/src/check/../../lib:$(LD_LIBRARY_PATH) $(MAKE) check prefix=$(CURDIR)/$$v); \
+	     fi; \
 	   fi; \
 	   echo "install for $$v"; \
 	   (cd src && $(MAKE) install prefix=$(CURDIR)/$$v); \

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