[SCM] qbs packaging branch, master, updated. debian/1.4.1+dfsg-5-2-g011f1e8

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 011f1e82e8dd7d8a783059d3d1b4849784c9b380
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jul 18 18:06:37 2015 +0300

    Simplify testing commands.
    
    No need to pass --settings-dir because we export XDG_CONFIG_HOME anyway.
---
 debian/changelog | 3 +++
 debian/rules     | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e2772b2..96cec4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qbs (1.4.1+dfsg-6) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Simplify testing commands: no need to pass --settings-dir because
+    we export XDG_CONFIG_HOME anyway.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 18 Jul 2015 18:00:48 +0300
 
diff --git a/debian/rules b/debian/rules
index 731df5e..067b09c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,6 @@ export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags -
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
-export XDG_CONFIG_HOME := $(CONFIG_DIR)
 
 # On other archs there are random segfaults in QtScript code.
 # We will enable the tests everywhere when QBS gets ported away from QtScript.
@@ -58,10 +57,11 @@ override_dh_auto_test:
 ifneq (,$(filter $(DEB_HOST_ARCH_CPU),$(tested_archs)))
 	set -ex; \
 		export LD_LIBRARY_PATH=$(CURDIR)/lib/:$$LD_LIBRARY_PATH; \
-		$(CURDIR)/bin/qbs-setup-toolchains --detect --settings-dir $(CONFIG_DIR)/QtProject; \
+		export XDG_CONFIG_HOME=$(CONFIG_DIR); \
+		$(CURDIR)/bin/qbs-setup-toolchains --detect; \
 		$(CURDIR)/bin/qbs-setup-qt /usr/bin/qmake qbs_autotests; \
-		[ -n "`$(CURDIR)/bin/qbs-config --settings-dir $(CONFIG_DIR)/QtProject --list profiles.qbs_autotests.baseProfile`" ] || \
-			$(CURDIR)/bin/qbs-config --settings-dir $(CONFIG_DIR)/QtProject profiles.qbs_autotests.baseProfile gcc; \
+		[ -n "`$(CURDIR)/bin/qbs-config --list profiles.qbs_autotests.baseProfile`" ] || \
+			$(CURDIR)/bin/qbs-config profiles.qbs_autotests.baseProfile gcc; \
 		dh_auto_test
 endif
 

-- 
qbs packaging