[libreoffice] 01/03: disable junit tests on 32bit archs (i386/armhf) which fail ucb_complex ith a libcurl-related SIGSEGV...

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit b73aa5b873f6cf803085f6d0a84a5991133caa28
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Nov 13 17:44:35 2017 +0100

    disable junit tests on 32bit archs (i386/armhf) which fail ucb_complex ith a libcurl-related SIGSEGV...
---
 changelog |  3 +++
 rules     | 24 ++++++++++++------------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/changelog b/changelog
index 460fc0a..ca00b6f 100644
--- a/changelog
+++ b/changelog
@@ -7,6 +7,9 @@ libreoffice (1:5.4.3-2) UNRELEASED; urgency=medium
 
   * debian/rules:
     - remove setting JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 again
+    - disable junit tests on 32bit archs (i386/armhf) which fail ucb_complex
+      with a libcurl-related SIGSEGV. At least upstream those are not ran
+      (at least for armhf) anyway on those archs.
 
  -- Rene Engelhard <rene at debian.org>  Fri, 10 Nov 2017 23:21:50 +0100
 
diff --git a/rules b/rules
index 246f426..49ba427 100755
--- a/rules
+++ b/rules
@@ -271,15 +271,15 @@ ifeq "$(ENABLE_JAVA)" "y"
         RUN_MAKE_CHECK=y
       endif
         RUN_MAKE_UICHECK=y
-        ifeq "$(DEB_HOST_ARCH)" "i386"
-	  ENABLE_JUNIT4=y
-        endif
+#        ifeq "$(DEB_HOST_ARCH)" "i386"
+#	  ENABLE_JUNIT4=y
+#        endif
         ifeq "$(DEB_HOST_ARCH)" "amd64"
 	  ENABLE_JUNIT4=y
         endif
-        ifeq "$(DEB_HOST_ARCH)" "armhf"
-	  ENABLE_JUNIT4=y
-        endif
+#        ifeq "$(DEB_HOST_ARCH)" "armhf"
+#	  ENABLE_JUNIT4=y
+#        endif
         ifeq "$(DEB_HOST_ARCH)" "arm64"
 	  ENABLE_JUNIT4=y
         endif
@@ -294,15 +294,15 @@ ifeq "$(ENABLE_JAVA)" "y"
         RUN_MAKE_CHECK=y
       endif
         RUN_MAKE_UICHECK=y
-        ifeq "$(DEB_HOST_ARCH)" "i386"
-	  ENABLE_JUNIT4=y
-        endif
+#        ifeq "$(DEB_HOST_ARCH)" "i386"
+#	  ENABLE_JUNIT4=y
+#        endif
         ifeq "$(DEB_HOST_ARCH)" "amd64"
 	  ENABLE_JUNIT4=y
         endif
-        ifeq "$(DEB_HOST_ARCH)" "armhf"
-	  ENABLE_JUNIT4=y
-        endif
+#        ifeq "$(DEB_HOST_ARCH)" "armhf"
+#	  ENABLE_JUNIT4=y
+#        endif
         ifeq "$(DEB_HOST_ARCH)" "arm64"
 	  ENABLE_JUNIT4=y
         endif

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