[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-5.4
Rene Engelhard
rene at moszumanska.debian.org
Thu Jul 13 21:53:15 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 8ec51d342032524bc030376954bf95d38cc8afe0
Merge: 4056679 6404d68
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Thu Jul 13 23:50:07 2017 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.4
changelog | 4 +++-
tests/control | 3 +++
tests/junit-subsequentcheck | 6 +++---
tests/odk-build-examples | 4 ++--
tests/uicheck | 4 ++--
5 files changed, 13 insertions(+), 8 deletions(-)
diff --cc changelog
index ab877e0,07884fc..fe6487d
--- a/changelog
+++ b/changelog
@@@ -21,59 -36,15 +21,61 @@@ libreoffice (1:5.4.0~rc2-1) UNRELEASED
pyuno-import test import pyuno while uno-import does import uno
(the uichecks do the former). Add python3 dependency for safety.
* debian/test/control: sort by importance
+ * debian/tests/: unapply patch after the make (or on error) so that the
+ next test can patch it...
++ * debian/tests/*: more cleanups for newer autopkgtests; use allow-stderr
++ instead of manual 2>&1
+
+ * debian/rules:
+ - be consequent and set RUN_PYTESTS=n (and RUN_MAKE_UICHECK=n) where we set
+ 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
+
- -- Rene Engelhard <rene at debian.org> Tue, 11 Jul 2017 20:52:21 +0200
++ -- Rene Engelhard <rene at debian.org> Thu, 13 Jul 2017 23:06:04 +0200
+
+libreoffice (1:5.4.0~rc1-1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/tests/control.in, debian/tests/uicheck,
+ debian/tests/patches/uicheck-standalone.diff: add initial version
+ of autopgktest running uitest
- -- Rene Engelhard <rene at debian.org> Tue, 11 Jul 2017 20:52:21 +0200
+ * debian/rules, debian/patches/system-xmlsec.diff: backport patch from
+ master and add conditional for system-xmlsec. use it.
-libreoffice (1:5.3.4-1) unstable; urgency=medium
+ * debian/rules, debian/control.lokit.in:
+ - move /usr/share/gir-1.0/LOKDocView-0.1.gir to libreofficekit-dev and
+ make libreofficekit-dev depend on gir1.2-lokdocview-0.1 as per gir
+ policy
+ * debian/rules:
+ - clean up JRE Depends; we consider java6_architectures as Java arch, so
+ let's remove the Java5 alternatives
+ * debian/copyright, debian/source/include-binaries: remove xmlsec
+ * debian/rules:
+ - fix dh_missing call
+ * debian/tests/sdk-examples: DevelopersGuide/OfficeDev/DesktopEnvironment
+ needs -ljawt. Build this to check this and the JAVA_PROC_TYPE setting also.
+
+ -- Rene Engelhard <rene at debian.org> Mon, 26 Jun 2017 19:25:59 +0200
- * New upstream release
+libreoffice (1:5.4.0~beta2-4) experimental; urgency=medium
+ * debian/patches/gb_SUPPRESS_TESTS.diff: add more tests to suppress
+ (from master)
* debian/patches/odk-settings-JAVA_PROC_TYPE.diff: set correct
JAVA_PROC_TYPE for arm{el,hf}, mips* and ppc64el
+ * debian/patches/gerrit_38597.diff: add from gerrit for master, fixes
+ i386 tests
+
+ * debian/rules, debian/scripts/locale-gen: upstream insists on using
+ en_US.UTF-8 for the tests. "Steal" the locale-gen stuff from gcc
+ * debian/control.in: make -core depend on ure (>= 5.4.0~beta2~)
+ (closes: #864690)
* debian/control.in:
- make -gstreamer recommend gstreamer1.0-plugins-bad as we apparently
want/need gtksink
diff --cc tests/control
index b408933,aa2682b..059d8bc
--- a/tests/control
+++ b/tests/control
@@@ -1,11 -1,10 +1,14 @@@
Tests: pyuno-import, uno-import
Depends: python3, python3-uno
+Tests: uicheck
+Depends: @builddeps@, libreoffice, python3-uno, locales
++Restrictions: allow-stderr
+
Tests: junit-subsequentcheck
Depends: @builddeps@, libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb
+ Restrictions: allow-stderr
-Tests: sdk-examples
-Depends: libreoffice-dev, libreoffice-dev-doc, libreoffice-java-common, build-essential, default-jdk, python3-uno, libreoffice-officebean, zip
+Tests: odk-build-examples
+Depends: @builddeps@, libreoffice-dev, libreoffice-dev-doc, libreoffice-java-common, python3-uno, libreoffice-officebean
+ Restrictions: allow-stderr
diff --cc tests/junit-subsequentcheck
index 2cc262b,9de1928..7e0cf4d
--- a/tests/junit-subsequentcheck
+++ b/tests/junit-subsequentcheck
@@@ -46,7 -37,4 +46,7 @@@ export PARALLELISM=$CHECK_PARALLELIS
make -rk \
OOO_TEST_SOFFICE=${OOO_TEST_SOFFICE} \
bridges_SELECTED_BRIDGE=foo \
- subsequentcheck verbose=t 2>&1
+ subsequentcheck verbose=t
+
+unapply
+
diff --cc tests/odk-build-examples
index e4bf666,0000000..5a6da0b
mode 100755,000000..100755
--- a/tests/odk-build-examples
+++ b/tests/odk-build-examples
@@@ -1,38 -1,0 +1,38 @@@
+#!/bin/bash
+# autopkgtest check: Run the odk/build-examples check against an installed
+# version of the LibreOffice SDK
+# (c) 2017 Software in the Public Interest, Inc.
+# Authors: Rene Engelhard <rene at debian.org>
+
+set -e
+set -E
+
+SRCDIR=`pwd`
+CHECK_PARALLELISM=1
+
+function unapply() {
+ cd $SRCDIR
+ echo "====== Unapplying the patch ======"
+ patch -p1 -R < ./debian/tests/patches/odk-build-examples-standalone.diff
+}
+
+trap "unapply" ERR
+
+echo "====== Patching the tree to build the odk build-examples test against an existing installation ======"
+patch -p1 < ./debian/tests/patches/odk-build-examples-standalone.diff
+
+echo
+echo "====== Generating configuration ======="
+rm -f config_host.mk
- ./debian/rules config_host.mk 2>&1
++./debian/rules config_host.mk
+
+echo
+echo "====== Starting build with ${CHECK_PARALLELISM} job against /usr/lib/libreoffice/sdk ======"
+
+cd $SRCDIR/odk
+export PARALLELISM=$CHECK_PARALLELISM
+make -rk \
- CustomTarget_odk/build-examples verbose=t 2>&1
++ CustomTarget_odk/build-examples verbose=t
+
+unapply
+
diff --cc tests/uicheck
index ada7c9f,0000000..6615e78
mode 100755,000000..100755
--- a/tests/uicheck
+++ b/tests/uicheck
@@@ -1,60 -1,0 +1,60 @@@
+#!/bin/bash
+# autopkgtest check: Run uicheck against an installed version of LibreOffice
+# (c) 2017 Software in the Public Interest, Inc.
+# Authors: Rene Engelhard <rene at debian.org>
+
+set -e
+set -E
+
+SRCDIR=`pwd`
+WORKDIR=`mktemp -d`
+CHECK_PARALLELISM=1
+
+function unapply() {
+ echo "====== Unapplying the patch ======"
+ patch -p1 -R < ./debian/tests/patches/uicheck-standalone.diff
+}
+
+trap "unapply" ERR
+
+echo "====== Patching the tree to build uicheck against an existing installation ======"
+patch -p1 < ./debian/tests/patches/uicheck-standalone.diff
+
+OOO_TEST_SOFFICE="${1:-path:/usr/lib/libreoffice/program/soffice}"
+
+# this normally shouldn't be needed but otherwise it wants a automatic
+# re-autogen.
+echo
+echo "====== Generating configuration ======="
+rm -f config_host.mk
- ./debian/rules config_host.mk 2>&1
++./debian/rules config_host.mk
+
+#echo
+#echo "====== Build "test" library required ======"
+#gb_SUPPRESS_TESTS=true make test.all verbose=t
+
+echo
+echo "====== Enabling core dumps ======"
+# yes, we want core dumps and stack traces
+ulimit -c unlimited
+
+echo
+echo "====== Generating en_US.UTF-8 locale ======"
+cd $WORKDIR
+$SRCDIR/debian/scripts/locale-gen
+
+
+echo
+echo "====== Starting uicheck with ${CHECK_PARALLELISM} job against ${OOO_TEST_SOFFICE} ======"
+
+cd $SRCDIR
+export PARALLELISM=$CHECK_PARALLELISM
+export LOCPATH=$WORKDIR/debian/locales
+export LANG=en_US.UTF-8
+export LC_ALL=en_US.UTF-8
+make -rk \
+ OOO_TEST_SOFFICE=${OOO_TEST_SOFFICE} \
- uicheck verbose=t 2>&1
++ uicheck verbose=t
+
+unapply
+
--
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