[sagemath] 02/03: Don't ignore timed-out tests on i386, they work fine

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository sagemath.

commit 3cc8891f0f800a3befeec6a7bdf15fb7e9de37c2
Author: Ximin Luo <infinity0 at debian.org>
Date:   Mon Sep 11 12:22:53 2017 +0200

    Don't ignore timed-out tests on i386, they work fine
---
 debian/changelog | 1 +
 debian/rules     | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7380907..4555884 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 sagemath (8.0-8) UNRELEASED; urgency=medium
 
   * Set a higher test timeout for slower architectures.
+  * Don't ignore timed-out tests on i386, they work fine.
 
  -- Ximin Luo <infinity0 at debian.org>  Mon, 11 Sep 2017 12:21:02 +0200
 
diff --git a/debian/rules b/debian/rules
index eee43de..c37f41d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -160,7 +160,9 @@ TESTS_MK = $(MAKE) -s --no-print-directory -f debian/tests.mk LOGFILE=$(LOGFILE)
 failed-tests%:
 	@$(TESTS_MK) "$@"
 
-ifeq (i386,$(shell dpkg-architecture -q DEB_HOST_ARCH))
+# We used to set this for i386 but it seems to be OK now.
+# Perhaps we should set it for armhf, let's see the buildd test results...
+ifneq (,$(filter $(DEB_BUILD_ARCH),))
 IGNORE_FAILURES = | sed -e '0,/Timed out/{//d;}' -e '0,/Timed out/{//d;}' -e '0,/Timed out/{//d;}'
 else
 IGNORE_FAILURES =

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