[Python-modules-commits] r21248 - in packages/gamera/trunk/debian (changelog rules)

[jwilk at users.alioth.debian.org]

    Date: Monday, April 16, 2012 @ 19:24:20
  Author: jwilk
Revision: 21248

Use xargs to iterate over all Python versions. Run tests in override_dh_auto_test.

Modified:
  packages/gamera/trunk/debian/changelog
  packages/gamera/trunk/debian/rules

Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog	2012-04-16 19:06:17 UTC (rev 21247)
+++ packages/gamera/trunk/debian/changelog	2012-04-16 19:24:20 UTC (rev 21248)
@@ -14,10 +14,13 @@
   * Cherry-pick upstream patch to fix compatibility with GCC 4.7.
     (gcc-4.7-compat.diff)
   * Update the copyright file.
-  * When running tests, set sys.path directly in debian/run-tests.py rather
-    than in debian/rules via PYTHONPATH.
+  * When running tests:
+    + Set sys.path directly in debian/run-tests.py rather than in debian/rules
+      via PYTHONPATH.
+    + Use xargs to iterate over all Python versions.
+  * Run tests in override_dh_auto_test rather than in override_dh_auto_build.
 
- -- Jakub Wilk <jwilk at debian.org>  Mon, 16 Apr 2012 21:05:02 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Mon, 16 Apr 2012 21:20:34 +0200
 
 gamera (3.3.2-2) unstable; urgency=low
 

Modified: packages/gamera/trunk/debian/rules
===================================================================
--- packages/gamera/trunk/debian/rules	2012-04-16 19:06:17 UTC (rev 21247)
+++ packages/gamera/trunk/debian/rules	2012-04-16 19:24:20 UTC (rev 21248)
@@ -11,6 +11,8 @@
     makeflags = -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 endif
 
+python_all = pyversions -r | tr ' ' '\n' | sed -e 'p; s/$$/-dbg/' | xargs -t -I {} env {}
+
 pythonpath = $$(_py_=$(strip $(1)); _py_=$${_py_\#python}; ls -d $(CURDIR)/build/lib.*-$${_py_})
 default_pythonpath = $(call pythonpath,$(shell pyversions -d))
 
@@ -36,12 +38,11 @@
 	rm -Rf include/vigra/
 	rm -Rf src/ga/
 	$(MAKE) -f debian/rules $(makeflags) build/stamp
+
+.PHONY: override_dh_auto_test
+override_dh_auto_test:
 ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
-	set -x -e; \
-	for python in $(shell pyversions -r); do \
-		$$python debian/run-tests.py; \
-		$$python-dbg debian/run-tests.py; \
-	done
+	$(python_all) debian/run-tests.py
 endif
 
 build/stamp: $(patsubst %,build/stamp-python%,$(shell pyversions -rv))