[SCM] qbs packaging branch, master, updated. debian/1.10.0+dfsg-2-2-g0184ea5

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qbs.git;a=commitdiff;h=0184ea5

The following commit has been merged in the master branch:
commit 0184ea5c9f5790a6e92d75c5cb8a28d23c857b64
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Jan 9 14:50:30 2018 +0300

    Properly support DEB_BUILD_OPTIONS=nocheck.
    
    Thanks to Helmut Grohne.
    Closes: #886656.
---
 debian/changelog | 2 ++
 debian/rules     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cac0c4f..028da48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qbs (1.10.0+dfsg-3) UNRELEASED; urgency=medium
 
+  * Properly support DEB_BUILD_OPTIONS=nocheck (closes: #886656). Thanks to
+    Helmut Grohne.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 09 Jan 2018 14:49:03 +0300
 
diff --git a/debian/rules b/debian/rules
index 665e031..0e4e2c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,6 +39,7 @@ override_dh_auto_install-indep:
 	dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp sub-static-pro-install_subtargets
 
 override_dh_auto_test-arch:
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 	set -ex; \
 		export LD_LIBRARY_PATH=$(CURDIR)/lib/${DEB_HOST_MULTIARCH}:$$LD_LIBRARY_PATH; \
 		export HOME=$(TMP_HOME_DIR); \
@@ -48,6 +49,7 @@ override_dh_auto_test-arch:
 		[ -n "`$(CURDIR)/bin/qbs-config --list profiles.qbs_autotests.baseProfile`" ] || \
 			$(CURDIR)/bin/qbs-config profiles.qbs_autotests.baseProfile gcc; \
 		LC_ALL=C.UTF-8 dh_auto_test
+endif
 
 override_dh_auto_test-indep:
 

-- 
qbs packaging