[Python-modules-commits] r21673 - in packages/html5lib/trunk/debian (changelog rules)

[bzed at users.alioth.debian.org]

    Date: Wednesday, May 9, 2012 @ 20:29:14
  Author: bzed
Revision: 21673

tests still disabled - test suite does not work at all :|

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

Modified: packages/html5lib/trunk/debian/changelog
===================================================================
--- packages/html5lib/trunk/debian/changelog	2012-05-09 20:11:31 UTC (rev 21672)
+++ packages/html5lib/trunk/debian/changelog	2012-05-09 20:29:14 UTC (rev 21673)
@@ -2,8 +2,7 @@
 
   * New upstream version
   * Fix watch file.
-  * Tidy debian/rules, using dh, bump debian/compat to 7,
-    use override_dh_auto_test to run tests.
+  * Tidy debian/rules, using dh, bump debian/compat to 7.
   * Migrate to dh_python2.
   * Drop no-setuptools patch, add python-setuptools as dependency.
   * Drop patch system and debian/README.source
@@ -11,7 +10,7 @@
   * Bump Standards-Version to 3.9.3.
   * Do not install tests folder. 
 
- -- Bernd Zeimetz <bzed at debian.org>  Wed, 09 May 2012 22:05:47 +0200
+ -- Bernd Zeimetz <bzed at debian.org>  Wed, 09 May 2012 22:28:28 +0200
 
 html5lib (0.90-1) unstable; urgency=low
 

Modified: packages/html5lib/trunk/debian/rules
===================================================================
--- packages/html5lib/trunk/debian/rules	2012-05-09 20:11:31 UTC (rev 21672)
+++ packages/html5lib/trunk/debian/rules	2012-05-09 20:29:14 UTC (rev 21673)
@@ -1,19 +1,22 @@
 #!/usr/bin/make -f
 
 PYVERS:=$(shell pyversions -vr)
+pythonpath = $$(ls -d $(CURDIR)/build/lib.*-$(1))
 
 
 %:
 	dh --with python2 $@
 
 override_dh_auto_test:
+ifeq(test-suite-is-broken-again,yes)
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	set -e ;\
 	   cd html5lib/tests ;\
 		for py in $(PYVERS); do  \
-			PYTHONPATH=$(CURDIR)/build/lib*-$$py python$$py runtests.py; \
+			PYTHONPATH=$(call pythonpath,$$py) python$$py runtests.py; \
 	done
 endif
+endif
 
 override_dh_auto_install:
 	dh_auto_install