[Python-modules-commits] [sphinx] 02/02: Refactor the command to run tests to better match upstream.

[Dmitry Shachnev]

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

mitya57 pushed a commit to branch master
in repository sphinx.

commit 7c99bde4924f57bad70d495fc63f20fc5037350c
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon May 2 15:29:32 2016 +0300

    Refactor the command to run tests to better match upstream.
---
 debian/changelog |  1 +
 debian/rules     | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6d45617..72692aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ sphinx (1.4.1-1) UNRELEASED; urgency=medium
   * Add dependency on python[3]-imagesize packages.
   * Bump Pygments build- and test dependencies to 2.1.1.
   * Demote python-sphinx recommendation of sphinx-doc to a suggestion.
+  * Refactor the command to run tests to better match upstream.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 03 Apr 2016 20:00:02 +0200
 
diff --git a/debian/rules b/debian/rules
index d06b92d..2683640 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,9 +20,6 @@ py2_libdir = $(call py_libdir,$(shell pyversions -d))
 py3_libdir = $(call py_libdir,$(shell py3versions -d))
 javascript_path = /usr/share/javascript/sphinxdoc/1.0/
 
-python_all = pyversions -r | tr ' ' '\n' | xargs -t -I {} env {}
-python3_all = py3versions -r | tr ' ' '\n' | xargs -t -I {} env {}
-
 .PHONY: clean
 clean:
 	dh_clean 
@@ -58,9 +55,13 @@ build-stamp: sphinx-build.py build/javascript-stamp
 ifeq "$(filter nocheck,$(DEB_BUILD_OPTIONS))" ""
 	# FIXME: https://github.com/sphinx-doc/sphinx/issues/703
 	export LC_ALL=C.UTF-8 && \
-	$(python_all) tests/run.py --verbose --no-skip
-	export LC_ALL=C.UTF-8 && \
-	$(python3_all) tests/run.py --verbose
+	set -ex; for py in $(shell pyversions -r) $(shell py3versions -r); do \
+		if [ "$$py" \< "python3.5" ]; then \
+			$$py tests/run.py -m '^test' --verbose -I py35; \
+		else \
+			$$py tests/run.py -m '^test' --verbose; \
+		fi; \
+	done
 	rm -rf build/py2/tests/ build/py3/tests/
 	xvfb-run -a ./debian/jstest/run-tests build/html/
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/sphinx.git