[libreoffice] 03/04: disable the sc_*_functions_test on arm64 (as for x86) - from master; make arm64 test failures fatal, too

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit fd995e3ba24bda80d80d9a8518d2837ee9a8c0d3
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Fri Oct 20 13:41:49 2017 +0000

    disable the sc_*_functions_test on arm64 (as for x86) - from master; make arm64 test failures fatal, too
---
 changelog                                    |  6 +++--
 patches/arm64-disable-sc-functions-test.diff | 37 ++++++++++++++++++++++++++++
 patches/series                               |  1 +
 rules                                        |  3 +++
 4 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index fd135b8..e2b16ca 100644
--- a/changelog
+++ b/changelog
@@ -14,6 +14,8 @@ libreoffice (1:5.4.3~rc1-1) experimental; urgency=medium
     go sure that we build gcc3_linux_aarch64/cpp2uno.cxx only with
     -fstack-protector. Works for us by chance because of above
     debian-hardened-buildflags-no-LO-fstack-protector-strong.diff
+  * debian/patches/arm64-disable-sc-functions-test.diff: add patch from master
+    to disable the sc_*_functions_test on arm64 (as for x86).
 
   * debian/rules:
     - *really* fix -dbgsym 0775 permissions by manually fixing them after
@@ -21,13 +23,13 @@ libreoffice (1:5.4.3~rc1-1) experimental; urgency=medium
       create them as 775 (at least on the buildds)
     - fix libreoffice-dev-doc.doc-base.lo-idl-ref (again)
     - add missing dependency to build-arch to install-arch
-    - make armhf test failures fatal now that above test is fixed which
+    - make armhf/arm64 test failures fatal now that above test is fixed which
       was the only one failing; upstream apparently also builds armhf/arm64
       flatpaks now for flathub
   * debian/copyright:
     - fix various missing-license-paragraph-in-dep5-copyright
 
- -- Rene Engelhard <rene at debian.org>  Wed, 18 Oct 2017 22:35:53 +0000
+ -- Rene Engelhard <rene at debian.org>  Fri, 20 Oct 2017 13:40:01 +0000
 
 libreoffice (1:5.4.2-3) unstable; urgency=medium
 
diff --git a/patches/arm64-disable-sc-functions-test.diff b/patches/arm64-disable-sc-functions-test.diff
new file mode 100644
index 0000000..5e327f9
--- /dev/null
+++ b/patches/arm64-disable-sc-functions-test.diff
@@ -0,0 +1,37 @@
+From 6cb20e0b298f41fe88984aebfe5454f936a0ae3a Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman at redhat.com>
+Date: Fri, 20 Oct 2017 10:52:48 +0200
+Subject: Disable CppunitTset_sc_*_functions_test for linux_aarch64 for now,
+ too
+
+> Oct 20 10:21:31 <sberg> erAck, when "Testing
+>  file:///run/build/libreoffice/sc/qa/unit/data/functions/array/fods/linest.fods"
+>  in CppunitTest_sc_array_functions_test fails with non-informative expected 1
+>  vs. actual 0, how can I reasonably debug that?  (and no, I don't have an X11
+>  connection to the relevant machine, to see what opening that .fods with LO
+>  would look like there)
+> Oct 20 10:25:04 <erAck> sberg: sigh.. we're still lacking an "analyze steps"
+>  in the functions test loader, so far only loading the doc and inspecting
+>  provides that; maybe getting individual cell results via UNO would work
+
+So disable these tests for aarch64 for now too, to get Flathub builds unstuck,
+until somebody finds a way to actually debug this.
+
+Change-Id: I9bf30d0d7185497f9ad4b04b60b6a67f34a8c44e
+
+diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
+index bd5b769..0b600f7 100644
+--- a/sc/Module_sc.mk
++++ b/sc/Module_sc.mk
+@@ -69,7 +69,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sc, \
+ # point weirdness (x87, registers, compiler optimization, ... whatever),
+ # disable them until someone finds a real cure.
+ 
+-ifneq ($(PLATFORMID),linux_x86)
++ifneq ($(filter-out linux_aarch64 linux_x86,$(PLATFORMID)),)
+ $(eval $(call gb_Module_add_slowcheck_targets,sc, \
+ 	CppunitTest_sc_functions_test_old \
+ 	CppunitTest_sc_database_functions_test \
+-- 
+cgit v0.10.2
+
diff --git a/patches/series b/patches/series
index 2342c33..fa046b8 100644
--- a/patches/series
+++ b/patches/series
@@ -37,3 +37,4 @@ icu-no-icu-config.diff
 ww8export-HAVE_MORE_FONTS.diff
 avoid-throwing-cpp-exceptions-across-libgpeg-c-frames.diff
 arm64-bridges-no-stack-protector-strong.diff
+arm64-disable-sc-functions-test.diff
diff --git a/rules b/rules
index eb1c619..5088f52 100755
--- a/rules
+++ b/rules
@@ -579,6 +579,9 @@ endif
 ifeq (armhf,$(DEB_HOST_ARCH))
   IGNORE_MAKE_CHECK_FAILURES:=
 endif
+ifeq (arm64,$(DEB_HOST_ARCH))
+  IGNORE_MAKE_CHECK_FAILURES:=
+endif
 
 OOO_64BIT_ARCHS = $(filter alpha amd64 arm64 ia64 kfreebsd-amd64 mips64 mips64el ppc64 ppc64el s390x sparc64, $(OOO_ARCHS))
 $(eval $(call gen_no_archs,OOO_64BIT_ARCHS))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git