From 957ea09a244c9d5f749f3973545a4d4b064998df Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 4 Apr 2011 12:11:52 +0200 Subject: * debian/rules: - Support the nocheck build option and ignore test failures on hurd (Closes: #610448) --- debian/changelog | 3 +++ debian/rules | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f97e2be2..adde1554 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,9 @@ python-apt (0.7.100.3) UNRELEASED; urgency=low - Package records 'Package' field now corresponds to shortname * debian/python3-apt-dbg.install - Do not try to install old-style debugging files. + * debian/rules: + - Support the nocheck build option and ignore test failures on hurd + (Closes: #610448) [ Scott Kitterman ] * Override override_dh_auto_install to install python3 extensions in the diff --git a/debian/rules b/debian/rules index d020e901..6425c78c 100755 --- a/debian/rules +++ b/debian/rules @@ -37,10 +37,15 @@ override_dh_strip: override_dh_compress: dh_compress -X.js -X_static/* -X _sources/* -X_sources/*/* -X.inv +# We ignore failures on hurd, since its locking is broken override_dh_auto_test: +ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) set -e; for python in $(shell pyversions -r); do \ - $$python tests/test_all.py -q; \ + $$python tests/test_all.py -q || [ "$(DEB_BUILD_ARCH_OS)" = "hurd" ]; \ done; +else + @echo "** tests disabled" +endif override_dh_python2: dh_python2 -N python-apt-common -- cgit v1.2.3