[Python-modules-commits] r20507 - in packages/python-pipeline/trunk/debian (changelog rules)

[jwilk at users.alioth.debian.org]

    Date: Sunday, February 19, 2012 @ 01:10:43
  Author: jwilk
Revision: 20507

Don't ignore test failures. 

Modified:
  packages/python-pipeline/trunk/debian/changelog
  packages/python-pipeline/trunk/debian/rules

Modified: packages/python-pipeline/trunk/debian/changelog
===================================================================
--- packages/python-pipeline/trunk/debian/changelog	2012-02-19 01:08:49 UTC (rev 20506)
+++ packages/python-pipeline/trunk/debian/changelog	2012-02-19 01:10:43 UTC (rev 20507)
@@ -14,8 +14,9 @@
   * Fix DEP-5 format URI.
   * Rewrite debian/rules from scratch, without using dh.
     + Reduce build-dependency on debhelper to >= 7.
+  * Don't ignore test failures. 
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 19 Feb 2012 02:07:40 +0100
+ -- Jakub Wilk <jwilk at debian.org>  Sun, 19 Feb 2012 02:10:20 +0100
 
 python-pipeline (0.1.3-2) unstable; urgency=low
 

Modified: packages/python-pipeline/trunk/debian/rules
===================================================================
--- packages/python-pipeline/trunk/debian/rules	2012-02-19 01:08:49 UTC (rev 20506)
+++ packages/python-pipeline/trunk/debian/rules	2012-02-19 01:10:43 UTC (rev 20507)
@@ -5,6 +5,8 @@
 python_all = pyversions -r $(CURDIR)/debian/control | tr ' ' '\n' | xargs -t -I {} env {}
 python3_all = $(patsubst py%,py3%,$(python_all))
 
+test_program = import pipeline as p, doctest as d, sys; sys.exit(d.testmod(p, report=1)[0] > 0)
+
 here = $(dir $(firstword $(MAKEFILE_LIST)))/..
 upstream_version = $(shell cd $(here) && dpkg-parsechangelog | sed -n -r -e '/^Version: ([0-9.]+).*/ { s//\1/p }')
 upstream_url_py2 = $(shell cd $(here) && uscan --dehs --download-version="$(upstream_version)" | sed -n -r -e '/<upstream-url>(.*)<.*/ { s//\1/p }')
@@ -31,9 +33,9 @@
 	cd py3k && python3 setup.py build
 ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 	set -e -x; \
-	$(python_all) -c 'import pipeline as p, doctest as d; d.testmod(p, report=1)'
+	$(python_all) -c '$(test_program)'
 	cd py3k && \
-		$(python3_all) -c 'import pipeline as p, doctest as d; d.testmod(p, report=1)'
+		$(python3_all) -c '$(test_program)'
 endif
 	touch $(@)