about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rwxr-xr-xdebian/rules2
2 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 12142dd7..3e860b8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+network-manager (1.1.91-2) UNRELEASED; urgency=medium
+
+  * Skip the test suite if "nocheck" is set via DEB_BUILD_OPTIONS.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 01 Mar 2016 21:34:04 +0100
+
 network-manager (1.1.91-1) unstable; urgency=medium
 
   * New upstream release (1.2 beta2).
diff --git a/debian/rules b/debian/rules
index d53ae20a..eb155412 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,4 +74,6 @@ override_dh_ppp:
 	dh_ppp --breaks
 
 override_dh_auto_test:
+ifeq (, $(filter nocheck, $(DEB_BUILD_OPTIONS)))
 	make check || ( find . -name test-suite.log -exec cat {} \;; exit 1; )
+endif