[SCM] qbs packaging branch, master, updated. debian/1.3.1+dfsg-1-6-g66d05e2

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit ce48f8cb36b322753a65a5be278b041e3e1c6d77
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Oct 6 13:40:38 2014 +0400

    Run tests with LD_LIBRARY_PATH+=lib.
---
 debian/changelog |  2 ++
 debian/rules     | 13 ++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f4e1c3e..30dc03c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ qbs (1.3.1+dfsg-2) UNRELEASED; urgency=medium
     (really closes: #763365).
   * Add a patch to correctly detect endianness of all supported
     by Debian architectures.
+  * Add lib/ to LD_LIBRARY_PATH when running tests (should fix
+    build failures on kfreebsd and hurd).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 06 Oct 2014 11:48:38 +0400
 
diff --git a/debian/rules b/debian/rules
index 6bf4c33..af40979 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,11 +54,14 @@ override_dh_auto_install-arch:
 
 override_dh_auto_test:
 	mkdir -p $(CONFIG_DIR)/QtProject
-	$(CURDIR)/bin/qbs-setup-toolchains --detect --settings-dir $(CONFIG_DIR)/QtProject
-	$(CURDIR)/bin/qbs-setup-qt /usr/bin/qmake qbs_autotests
-	grep baseProfile $(CONFIG_DIR)/QtProject/qbs.conf || \
-		/bin/echo "qt-project\qbs\profiles\qbs_autotestsaseProfile=gcc" >> $(CONFIG_DIR)/QtProject/qbs.conf
-	dh_auto_test
+	set -ex; \
+		export LD_LIBRARY_PATH=$(CURDIR)/lib/:$$LD_LIBRARY_PATH; \
+		$(CURDIR)/bin/qbs-setup-toolchains --detect --settings-dir $(CONFIG_DIR)/QtProject; \
+		$(CURDIR)/bin/qbs-setup-qt /usr/bin/qmake qbs_autotests; \
+		grep baseProfile $(CONFIG_DIR)/QtProject/qbs.conf || \
+			/bin/echo "qt-project\qbs\profiles\qbs_autotestsaseProfile=gcc" \
+			>> $(CONFIG_DIR)/QtProject/qbs.conf; \
+		dh_auto_test
 
 override_dh_install:
 	dh_install --fail-missing

-- 
qbs packaging