[SCM] qtdeclarative packaging branch, master, updated. debian/5.6.1-9-4-g3746426
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Thu Sep 29 08:34:31 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=3746426
The following commit has been merged in the master branch:
commit 37464262ddfc964274927d367e84485ec95b08c0
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Thu Sep 29 11:34:15 2016 +0300
Set LD_LIBRARY_PATH when running tests, to fix failures on buildds.
---
debian/changelog | 1 +
debian/rules | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index dcedb23..5dcb535 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtdeclarative-opensource-src (5.6.1-10) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
* Do not use dbus-launch during tests running, not needed (and wrong).
* Drop useless build-dependencies on libgl1-mesa-{dri,glx}.
+ * Set LD_LIBRARY_PATH when running tests, to fix failures on buildds.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 28 Sep 2016 23:17:35 +0300
diff --git a/debian/rules b/debian/rules
index abc14ba..32de3f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,8 @@ override_dh_auto_test-arch:
mkdir -p $(CURDIR)/.local/share/QtProject/tst_qqmlengine
xvfb-run -a \
-s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX" \
- dh_auto_test --max-parallel=1 -- QML2_IMPORT_PATH=$(CURDIR)/test_root/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qml HOME=$(CURDIR)
+ dh_auto_test --max-parallel=1 -- QML2_IMPORT_PATH=$(CURDIR)/test_root/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qml \
+ HOME=$(CURDIR) LD_LIBRARY_PATH=$(CURDIR)/lib
override_dh_auto_test-indep:
--
qtdeclarative packaging
More information about the pkg-kde-commits
mailing list