[sagemath] 05/07: Add a pkg.sagemath.nolongcheck build profile for skipping --long tests

[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 53b631b68069d831a106921b765d4fefd7a7f817
Author: Ximin Luo <infinity0 at debian.org>
Date:   Thu Aug 17 14:14:21 2017 +0200

    Add a pkg.sagemath.nolongcheck build profile for skipping --long tests
---
 debian/changelog | 1 +
 debian/rules     | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2e76653..8eb508e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 sagemath (8.0-3) UNRELEASED; urgency=medium
 
   * Fix FTBFS everywhere caused by bad Makefile syntax for running tests.
+  * Add a pkg.sagemath.nolongcheck build profile for skipping --long tests.
 
  -- Ximin Luo <infinity0 at debian.org>  Thu, 17 Aug 2017 13:54:01 +0200
 
diff --git a/debian/rules b/debian/rules
index eb0c250..3bf87c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,10 @@ export CCACHE_BASEDIR := $(CURDIR)/debian/build
 $(shell mkdir -p "$(CCACHE_DIR)")
 endif
 
+ifeq (,$(filter pkg.sagemath.nolongcheck,$(DEB_BUILD_PROFILES)))
+SAGE_TEST_FLAGS = --long
+endif
+
 export SAGE_LOCAL = $(CURDIR)/debian/build/usr
 export PYTHONPATH = $(CURDIR)/debian/build/usr/lib/python2.7/dist-packages
 export DOT_SAGE = $(CURDIR)/debian/test
@@ -99,7 +103,7 @@ ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
 endif
 
 run_tests = \
-	cd sage && ./sage -t -p $(NUMJOBS) --long --logfile=logs/ptestlong-$(1).log $(2)
+	cd sage && ./sage -t -p $(NUMJOBS) $(SAGE_TEST_FLAGS) --logfile=logs/ptestlong-$(1).log $(2)
 # If tests fail but not by too many more, then retry them once not in parallel
 # i386 seems to have issues running parallel tests - TODO: investigate this in more detail
 check_test_log = debian/rules -s LOGFILE=sage/logs/ptestlong-$(1).log

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