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

[jwilk at users.alioth.debian.org]

    Date: Monday, June 6, 2011 @ 21:13:56
  Author: jwilk
Revision: 17317

Simplify test suite running code.

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

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2011-06-06 20:59:01 UTC (rev 17316)
+++ packages/python-docutils/trunk/debian/changelog	2011-06-06 21:13:56 UTC (rev 17317)
@@ -21,8 +21,9 @@
   * Drop unused virtual packages: python-odtwriter, rst2odt, docutils-writer-odt.
   * Build packages for Python 3 (closes: #577725).
   * Simplify the clean target.
+  * Simplify test suite running code.
 
- -- Jakub Wilk <jwilk at debian.org>  Mon, 06 Jun 2011 22:30:45 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Mon, 06 Jun 2011 23:13:34 +0200
 
 python-docutils (0.7-2) unstable; urgency=low
 

Modified: packages/python-docutils/trunk/debian/rules
===================================================================
--- packages/python-docutils/trunk/debian/rules	2011-06-06 20:59:01 UTC (rev 17316)
+++ packages/python-docutils/trunk/debian/rules	2011-06-06 21:13:56 UTC (rev 17317)
@@ -35,8 +35,9 @@
 	done
 ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 	# Run test suite for Python 2.X:
-	set -e && for python in $(shell pyversions -r); do \
-		PYTHONPATH=.:extras $$python test/alltests.py; \
+	set -e && cd build/lib*/ && \
+	for python in $(shell pyversions -r); do \
+		$$python ../../test/alltests.py; \
 	done
 	# Run test suite for Python 3.X:
 	-set -e && cd py3k/build/lib*/ && \
@@ -51,8 +52,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	$(PYTHON) setup.py clean --all
-	rm -rf py3k/
+	rm -rf build/ py3k/
 	find -name '*.py[co]' -delete
 	rm -f *.html
 	rm -rf debian/man.tmp