[libreoffice] 01/01: disable the tests on bigendian archs: hang (failures non-fatal anyway.)
Rene Engelhard
rene at moszumanska.debian.org
Wed Jul 12 06:02:22 UTC 2017
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 76051f120594d415c6d1f3f684fb0940098804bf
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Wed Jul 12 08:02:17 2017 +0200
disable the tests on bigendian archs: hang (failures non-fatal anyway.)
---
changelog | 1 +
control | 16 ++++++++--------
rules | 10 +++++++++-
3 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/changelog b/changelog
index 518caad..ab877e0 100644
--- a/changelog
+++ b/changelog
@@ -29,6 +29,7 @@ libreoffice (1:5.4.0~rc2-1) UNRELEASED; urgency=medium
RUN_MAKE_CHECK=n
- be consequent and add $(IGNORE_MAKE_CHECK_FAILURES) also to the "extra"
test runs
+ - disable the tests on bigendian archs: hang (failures non-fatal anyway.)
* debian/control.in:
- make -common Conflicts: older mediawikis to go sure
diff --git a/control b/control
index d55cffa..7fbd78b 100644
--- a/control
+++ b/control
@@ -25,19 +25,19 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
firebird-dev (>= 3.0.0.32483.ds4-4) [!hppa !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64],
firebird3.0-server-core [!hppa !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
flex (>= 2.3.35),
- fontconfig [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
- fonts-crosextra-carlito [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
- fonts-dejavu [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
- fonts-liberation [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
+ fontconfig [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
+ fonts-crosextra-carlito [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
+ fonts-dejavu [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
+ fonts-liberation [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
g++-7 (>= 7-20170106) [m68k],
gcc-7 (>= 7-20170106) [m68k],
- gdb [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
+ gdb [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
gettext,
gobject-introspection (>= 1.32.0),
gperf,
java-common (>= 0.49),
javahelper (>= 0.37~),
- junit4 (>= 4.8.2-2) [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
+ junit4 (>= 4.8.2-2) [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
kdelibs5-dev (>= 4:4.3.4),
libabw-dev (>= 0.1),
libarchive-zip-perl [!hppa !ia64 !mips64 !s390 !sparc],
@@ -57,7 +57,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
libclucene-dev (>= 2.3.3.4-4.1),
libcmis-dev (>= 0.5.0-3),
libcollada2gltfconvert-dev (>= 20140924-2)[amd64 i386],
- libcppunit-dev (>= 1.14) [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
+ libcppunit-dev (>= 1.14) [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
libcups2-dev,
libcurl4-gnutls-dev,
libdbus-glib-1-dev (>= 0.70),
@@ -140,7 +140,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
libxt-dev,
libxtst-dev,
libzmf-dev,
- locales [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
+ locales [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
lp-solve (>= 5.5.0.13-5+b1),
make (>= 3.81-8.2),
maven-repo-helper,
diff --git a/rules b/rules
index ad6f4c2..2faf5b7 100755
--- a/rules
+++ b/rules
@@ -264,7 +264,11 @@ ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(JDK)" "default"
ifeq "$(shell LANG=C /usr/lib/jvm/default-java/bin/java -version 2>&1 | tail -n 1 | awk '{ print $$1 }')" "OpenJDK"
+ ifeq "$(DEB_HOST_ARCH_ENDIAN)" "big"
+ RUN_MAKE_CHECK=n
+ else
RUN_MAKE_CHECK=y
+ endif
RUN_MAKE_UICHECK=y
ifeq "$(DEB_HOST_ARCH)" "i386"
ENABLE_JUNIT4=y
@@ -277,7 +281,11 @@ ifeq "$(ENABLE_JAVA)" "y"
endif
else
ifeq "$(JDK)" "openjdk"
+ ifeq "$(DEB_HOST_ARCH_ENDIAN)" "big"
+ RUN_MAKE_CHECK=n
+ else
RUN_MAKE_CHECK=y
+ endif
RUN_MAKE_UICHECK=y
ifeq "$(DEB_HOST_ARCH)" "i386"
ENABLE_JUNIT4=y
@@ -630,7 +638,7 @@ $(eval $(call gen_no_archs,OOO_REPORTDESIGN_ARCHS))
OOO_FIREBIRD_ARCHS := $(OOO_LE_ARCHS)
$(eval $(call gen_no_archs,OOO_FIREBIRD_ARCHS))
-OOO_CHECK_ARCHS := $(filter-out kfreebsd-i386 kfreebsd-amd64 sparc64,$(OOO_ARCHS))
+OOO_CHECK_ARCHS := $(filter-out kfreebsd-i386 kfreebsd-amd64 $(OOO_BE_ARCHS),$(OOO_ARCHS))
$(eval $(call gen_no_archs,OOO_CHECK_ARCHS))
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list