diff --git a/debian/changelog b/debian/changelog index 03f9ccd..0f52562 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-os-testr (0.2.0-4) unstable; urgency=medium + + * Fixed tweak of $PATH when running tests (Closes: #806489). + + -- Thomas Goirand Wed, 02 Dec 2015 09:48:32 +0100 + python-os-testr (0.2.0-3) unstable; urgency=medium * override_dh_python3 to fix Py3 shebang. diff --git a/debian/rules b/debian/rules index 0e63a5d..a08f620 100755 --- a/debian/rules +++ b/debian/rules @@ -8,8 +8,6 @@ UPSTREAM_GIT = git://github.com/openstack/os-testr.git export OSLO_PACKAGE_VERSION=$(VERSION) -export PATH+=:$(CURDIR)/debian/bin - %: dh $@ --buildsystem=python_distutils --with python2,python3,sphinxdoc @@ -46,7 +44,7 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) rm -rf .testrepository ; \ testr-python$$PYMAJOR init ; \ TEMP_REZ=`mktemp -t` ; \ - PYTHONPATH=$(CURDIR) PYTHON=python$$i testr-python$$PYMAJOR run --subunit | tee $$TEMP_REZ | subunit2pyunit ; \ + export PATH=$$PATH:$(CURDIR)/debian/bin ; PYTHONPATH=$(CURDIR) PYTHON=python$$i testr-python$$PYMAJOR run --subunit | tee $$TEMP_REZ | subunit2pyunit ; \ cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats ; \ rm -f $$TEMP_REZ ; \ testr-python$$PYMAJOR slowest ; \