[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.9.0-beta3-2-17-g9330dc6

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 9330dc6771503ab332486ddac8cff60904136dd8
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jun 17 14:49:10 2017 +0300

    Export QT_LOGGING_RULES when running tests.
    
    To override settings from our new qtlogging.ini file.
---
 debian/changelog | 2 ++
 debian/rules     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ec99a40..1146d5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qtdeclarative-opensource-src (5.9.0-2) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Add a patch that should fix crashes on big endian systems.
   * Add some new locations to fix_test_remove_qlibraryinfo.patch.
+  * Export QT_LOGGING_RULES when running tests, to override settings from
+    our new qtlogging.ini file.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 17 Jun 2017 13:54:29 +0300
 
diff --git a/debian/rules b/debian/rules
index cc710df..1dde86a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,7 +58,7 @@ override_dh_auto_test-arch:
 	$(MAKE) install -Csrc/imports INSTALL_ROOT=$(CURDIR)/test_root
 	mkdir -p $(CURDIR)/.local/share/QtProject/tst_qqmlengine
 	# Make the tests non-fatal, see the 5.7.1~20161021-2 changelog.
-	-xvfb-run -a \
+	-QT_LOGGING_RULES="default.debug=true;qml.debug=true;js.debug=true" xvfb-run -a \
 	         -s "-screen 0 1024x768x24 +extension RANDR +extension RENDER +extension GLX" \
 	         dh_auto_test --max-parallel=1 -- -k -Ctests/auto \
 	         QML2_IMPORT_PATH=$(CURDIR)/test_root/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qml \

-- 
qtdeclarative packaging