[sagemath] 01/01: Fix test retry logic and extend the timeout for slow buildds

[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 1f5b1fa66816a3f6c85465f388899a8f221294f7
Author: Ximin Luo <infinity0 at debian.org>
Date:   Thu Dec 22 11:37:28 2016 +0100

    Fix test retry logic and extend the timeout for slow buildds
---
 debian/rules | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index d2b68fb..924e027 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,14 @@ include /usr/share/dpkg/pkg-info.mk
 
 #export DH_VERBOSE=1
 
-is_prerelease = test $(DEB_DISTRIBUTION) = UNRELEASED -o $(DEB_DISTRIBUTION) = unstable-sage
+# If we're doing a pre-release, then be less strict about test failures, etc
+ifneq (,$(filter $(DEB_DISTRIBUTION),UNRELEASED unstable-sage))
+is_prerelease = true
+else
+is_prerelease = false
+# some buildds are a bit slow
+export SAGE_TIMEOUT_LONG = 7200
+endif
 
 # Use ccache if pkg.sagemath.ccache build-profile is active.
 # Your rebuilds will be *much quicker*.
@@ -173,7 +180,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	elif debian/rules -s had-few-failures; then :; else \
 	  debian/rules -s had-not-too-many-failures && \
 	  mv sage/logs/ptestlong.log sage/logs/ptestlong.log.1 && \
-	  { $(run_tests) -f; debian/rules -s had-few-failures; }; \
+	  { $(run_tests) -f; cd "$(CURDIR)" && debian/rules -s had-few-failures; }; \
 	fi
 endif
 

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