[SCM] qt3d packaging branch, master, updated. 4487e99ecf5685349ddae144df7e474271b07373

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 4487e99ecf5685349ddae144df7e474271b07373
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Aug 30 17:50:29 2015 +0300

    Some changes to override_dh_auto_test target.
    
    * Split into -arch and -indep. We do not want to build any code during
      indep builds, so there is nothing to test.
    * Use filter instead of findstring. The latter will have some false-positives,
      i.e. match ppc64 in ppc64el.
    * On not whitelisted architectures, still run tests, but ignore the result.
    * Use dh_auto_test instead of make check, to make DEB_BUILD_OPTIONS=nocheck
      work.
    * Do not pass LD_LIBRARY_PATH as make variable, qmake will set it to correct
      value anyway.
---
 debian/rules | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index cdaae8d..7270f08 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,7 +44,11 @@ override_dh_auto_install:
 	# Remove libtool-like files
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
-override_dh_auto_test:
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testrun_architectures)))
-	xvfb-run -a -s "-screen 0 640x480x24" make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib QML2_IMPORT_PATH=$(CURDIR)/qml
+override_dh_auto_test-arch:
+ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),$(testrun_architectures)))
+	xvfb-run -a -s "-screen 0 640x480x24" dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins QML2_IMPORT_PATH=$(CURDIR)/qml
+else
+	-xvfb-run -a -s "-screen 0 640x480x24" dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins QML2_IMPORT_PATH=$(CURDIR)/qml
 endif
+
+override_dh_auto_test-indep:

-- 
qt3d packaging