[SCM] qtgraphicaleffects packaging branch, ubuntu, updated. debian/5.6.1-3-12-g5962ef7

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 97eec376eb14dbc2e0475a4a3e6bb73bc803025c
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Jul 26 12:09:14 2016 +0000

    Merge with Debian. The Ubuntu changes could be dropped once nothing depends
    
    * Merge with Debian. The Ubuntu changes could be dropped once nothing depends
      on the transitional package libqt5qml-graphicaleffects.
    * Skip tests on powerpc for now (failing).
---
 debian/changelog | 3 ++-
 debian/rules     | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 39f8da2..89efcf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ qtgraphicaleffects-opensource-src (5.6.1-3ubuntu1) UNRELEASED; urgency=medium
   * Run the tests against installed module, to make them work.
 
   [ Timo Jyrinki ]
-  * Merge with Debian. The Ubuntu changes can be dropped once nothing depends 
+  * Merge with Debian. The Ubuntu changes could be dropped once nothing depends 
     on the transitional package libqt5qml-graphicaleffects.
+  * Skip tests on powerpc for now (failing).
 
  -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Wed, 20 Jul 2016 04:41:45 +0000
 
diff --git a/debian/rules b/debian/rules
index df0d5d8..6bd8c2f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,9 @@
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+# Skip tests on the archs they are known to be flaky with current configuration
+testskip_architectures := powerpc
+
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
@@ -23,8 +26,10 @@ override_dh_auto_build-indep:
 	dh_auto_build -Smakefile -- docs
 
 override_dh_auto_test-arch:
+ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(testskip_architectures)))
 	$(MAKE) install INSTALL_ROOT=$(CURDIR)/test_root
 	dh_auto_test -- QT_QPA_PLATFORM=minimal QML2_IMPORT_PATH=$(CURDIR)/test_root/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qml
+endif
 
 override_dh_auto_test-indep:
 

-- 
qtgraphicaleffects packaging