[SCM] qt3d packaging branch, experimental, updated. debian/5.5.1-5-24-g387acda

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 387acda04da0beac43e28e51bbba0d44f49faa2e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Jun 15 17:42:56 2016 +0300

    Add a patch to make the tests pass on big endian systems too.
---
 debian/changelog                     |  4 ++
 debian/patches/series                |  1 +
 debian/patches/tests_big_endian.diff | 89 ++++++++++++++++++++++++++++++++++++
 debian/rules                         |  7 ---
 4 files changed, 94 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2056614..090f21b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,10 @@ qt3d-opensource-src (5.6.1-1) UNRELEASED; urgency=medium
   * Fix duplicated short description.
   * Update debian/copyright.
 
+  [ Dmitry Shachnev ]
+  * Add a patch to make the tests pass on big endian systems too.
+    - Check the tests exit status on all architectures.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 31 Mar 2016 20:06:22 -0300
 
 qt3d-opensource-src (5.5.1-5) unstable; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c174094
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+tests_big_endian.diff
diff --git a/debian/patches/tests_big_endian.diff b/debian/patches/tests_big_endian.diff
new file mode 100644
index 0000000..1b4d4b5
--- /dev/null
+++ b/debian/patches/tests_big_endian.diff
@@ -0,0 +1,89 @@
+Description: make QHandle tests pass on big endian systems
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-yet
+Last-Update: 2016-06-15
+
+--- a/tests/auto/core/handle/tst_handle.cpp
++++ b/tests/auto/core/handle/tst_handle.cpp
+@@ -41,6 +41,12 @@
+ #define private public
+ #include <Qt3DCore/private/qhandle_p.h>
+ 
++#if Q_BYTE_ORDER == Q_BIG_ENDIAN
++#define GET_EXPECTED_HANDLE(qHandle) ((qHandle.index() << (qHandle.CounterBits + 2)) + (qHandle.counter() << 2))
++#else /* Q_LITTLE_ENDIAN */
++#define GET_EXPECTED_HANDLE(qHandle) (qHandle.index() + (qHandle.counter() << qHandle.IndexBits))
++#endif
++
+ class tst_Handle : public QObject
+ {
+     Q_OBJECT
+@@ -88,14 +94,14 @@
+     QVERIFY(h.index() == 0);
+     QVERIFY(h.counter() == 1);
+     qDebug() << h;
+-    QVERIFY(h.handle() == 65536);
++    QVERIFY(h.handle() == GET_EXPECTED_HANDLE(h));
+ 
+     Handle h2(1, 1);
+     QVERIFY(h2.isNull() == false);
+     QVERIFY(h2.index() == 1);
+     QVERIFY(h2.counter() == 1);
+     qDebug() << h2;
+-    QVERIFY(h2.handle() == 65537);
++    QVERIFY(h2.handle() == GET_EXPECTED_HANDLE(h2));
+ }
+ 
+ void tst_Handle::copyConstruction()
+@@ -105,7 +111,7 @@
+     QVERIFY(h2.isNull() == false);
+     QVERIFY(h2.index() == 0);
+     QVERIFY(h2.counter() == 1);
+-    QVERIFY(h2.handle() == 65536);
++    QVERIFY(h2.handle() == GET_EXPECTED_HANDLE(h2));
+ }
+ 
+ void tst_Handle::assignment()
+@@ -115,7 +121,7 @@
+     QVERIFY(h2.isNull() == false);
+     QVERIFY(h2.index() == 0);
+     QVERIFY(h2.counter() == 1);
+-    QVERIFY(h2.handle() == 65536);
++    QVERIFY(h2.handle() == GET_EXPECTED_HANDLE(h2));
+ }
+ 
+ void tst_Handle::equality()
+@@ -125,7 +131,7 @@
+     QVERIFY(h1.isNull() == false);
+     QVERIFY(h1.index() == 2);
+     QVERIFY(h1.counter() == 1);
+-    QVERIFY(h1.handle() == 65538);
++    QVERIFY(h1.handle() == GET_EXPECTED_HANDLE(h1));
+     QVERIFY(h1 == h2);
+ }
+ 
+@@ -136,7 +142,7 @@
+     QVERIFY(h1.isNull() == false);
+     QVERIFY(h1.index() == 2);
+     QVERIFY(h1.counter() == 1);
+-    QVERIFY(h1.handle() == 65538);
++    QVERIFY(h1.handle() == GET_EXPECTED_HANDLE(h1));
+     QVERIFY(h1 != h2);
+ 
+     Handle h3(2, 2);
+@@ -161,13 +167,13 @@
+     QVERIFY(h1.isNull() == false);
+     QVERIFY(h1.index() == 0);
+     QVERIFY(h1.counter() == 1);
+-    QVERIFY(h1.handle() == 4194304);
++    QVERIFY(h1.handle() == GET_EXPECTED_HANDLE(h1));
+ 
+     BigHandle h2(1, 1);
+     QVERIFY(h2.isNull() == false);
+     QVERIFY(h2.index() == 1);
+     QVERIFY(h2.counter() == 1);
+-    QVERIFY(h2.handle() == 4194305);
++    QVERIFY(h2.handle() == GET_EXPECTED_HANDLE(h2));
+ 
+     QVERIFY(BigHandle::maxIndex() == (1 << 22) - 1);
+     QVERIFY(BigHandle::maxCounter() == (1 << (32 - 22 - 2)) - 1);
diff --git a/debian/rules b/debian/rules
index f4c7ac4..7177f1c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,9 +11,6 @@ export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags -
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
-# Run tests only on archs known to pass in the past
-testrun_architectures := amd64 arm64 armhf i386 ppc64el
-
 %:
 	dh $@ --fail-missing --parallel --with pkgkde_symbolshelper --dbg-package=qt3d5-dbg
 
@@ -47,10 +44,6 @@ override_dh_auto_install-indep:
 	$(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
 
 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