[Reproducible-builds] [dh-python] 101/183: Disable two tests in test201 dir if /usr/bin/python2.6 is not available

Jérémy Bobbio lunar at moszumanska.debian.org
Fri Sep 19 15:30:25 UTC 2014


This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/reproducible_builds
in repository dh-python.

commit 8e83d7b096a8a56281b1c260affae223abb3c4d8
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Sat Aug 31 14:57:31 2013 +0200

    Disable two tests in test201 dir if /usr/bin/python2.6 is not available
---
 debian/changelog    | 1 +
 tests/t201/Makefile | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a8ddb2d..cb27671 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ dh-python (1.20130830-1) UNRELEASED; urgency=low
     - distutils build plugin: use default interpreter symlink in install step
       (if interpreter version matches the default one) - this will force
       distutils to not hardcode interpreter version in shebangs
+  * Disable two tests in test201 dir if /usr/bin/python2.6 is not available
 
   [ Dmitry Shachnev ]
   * Make sure tests do not require python-support.
diff --git a/tests/t201/Makefile b/tests/t201/Makefile
index 749b028..bd2fd19 100644
--- a/tests/t201/Makefile
+++ b/tests/t201/Makefile
@@ -6,8 +6,10 @@ DPY=$(DEBPYTHON_DEFAULT)
 check:
 	grep -q "Recommends: .*python-mako" debian/python-foo/DEBIAN/control
 	#grep -q 'python-foo (>= 2:0.1~rc2)' debian/python-foo/DEBIAN/control
-	test -f debian/python-foo/usr/lib/python2.6/dist-packages/foo/__init__.py
-	test ! -f debian/python-foo/usr/lib/python2.6/dist-packages/foo/spam.py
+	if [ -x /usr/bin/python2.6 ]; then\
+		test -f debian/python-foo/usr/lib/python2.6/dist-packages/foo/__init__.p;\
+		test ! -f debian/python-foo/usr/lib/python2.6/dist-packages/foo/spam.py;\
+	fi
 	grep -q "Depends: .*python (<<" debian/python-foo/DEBIAN/control
 	[ "`readlink debian/python-foo/usr/lib/python$(DPY)/dist-packages/foo/absolute_link_to_tmp`" = "/tmp" ]
 	[ "`readlink debian/python-foo/usr/lib/python$(DPY)/dist-packages/foo/link_to_parent_dir`" = ".." ]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dh-python.git



More information about the Reproducible-builds mailing list