[Pkg-telepathy-commits] [empathy] 01/03: debian/rules: Don't try to start dbus or xvfb if nocheck is set

[Laurent Bigonville]

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

bigon pushed a commit to branch debian
in repository empathy.

commit ceb93f50a7c12aa7da5406b03c92d8edbdf2521d
Author: Laurent Bigonville <bigon at debian.org>
Date:   Wed Oct 18 11:37:36 2017 +0200

    debian/rules: Don't try to start dbus or xvfb if nocheck is set
---
 debian/changelog | 3 ++-
 debian/rules     | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2e87982..8c25945 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ empathy (3.25.90-2) UNRELEASED; urgency=medium
 
   * debian/rules: Make the tests non-fatal for now, they fails on 32 bits
     architectures ATM
+  * debian/rules: Don't try to start dbus or xvfb if nocheck is set
 
- -- Laurent Bigonville <bigon at debian.org>  Wed, 18 Oct 2017 11:32:11 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Wed, 18 Oct 2017 11:36:18 +0200
 
 empathy (3.25.90-1) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index fd2a4c4..1b1c10d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,4 +41,6 @@ override_dh_strip:
 	dh_strip --dbgsym-migration='empathy-dbg (<< 3.12.11-2~)'
 
 override_dh_auto_test:
+ifeq (, $(filter nocheck, $(DEB_BUILD_OPTIONS)))
 	xvfb-run dbus-run-session dh_auto_test || true
+endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/empathy.git