[libreoffice] 01/05: Revert "remove disable-tiledrendering-test.diff"
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.0
in repository libreoffice.
commit 80ae40940d348c21b913c47a6bc86b2234bcb2e7
Author: Rene Engelhard <rene@debian.org>
Date: Tue Nov 17 12:44:02 2015 +0100
Revert "remove disable-tiledrendering-test.diff"
This reverts commit 4333c045a2f1d0d9618fe759f4fbe4b1ca7e8f49.
Conflicts:
changelog
patches/series
Conflicts:
changelog
patches/disable-flaky-tests.diff
---
changelog | 4 ++++
patches/disable-flaky-tests.diff | 41 ++++++++++++++++++++++++++++++++
patches/disable-tiledrendering-test.diff | 17 -------------
patches/series | 1 -
4 files changed, 45 insertions(+), 18 deletions(-)
diff --git a/changelog b/changelog
index e481305..4a538af 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,10 @@ libreoffice (1:5.0.4~rc1~git20151108-1) UNRELEASED; urgency=medium
- fixes crash when selecting the border style in some window managers
(closes: #801504)
+ * debian/patches/disable-flaky-tests.diff: disable also
+ libreofficekit_tiledrendering as it SIGSEGVs after OK (but lloconv works)
+ with merged libs
+
-- Rene Engelhard <rene@debian.org> Mon, 02 Nov 2015 23:02:09 +0100
libreoffice (1:5.0.3-1) UNRELEASED; urgency=medium
diff --git a/patches/disable-flaky-tests.diff b/patches/disable-flaky-tests.diff
index fdd9b4c..2562906 100644
--- a/patches/disable-flaky-tests.diff
+++ b/patches/disable-flaky-tests.diff
@@ -92,3 +92,44 @@ index e9b344c..ffc94f7 100644
-endif
-
# vim: set noet sw=4 ts=4:
+
+20:42 <@vmiklos> _rene_: yes?
+20:43 < _rene_> vmiklos: see the ml. works, but that of course is not a fix for the test :)
+20:43 < _rene_> s/works/lloconv works/
+20:43 < _rene_> vmiklos: and as a test failure is fatal (at least on i386/amd64)..
+20:44 < loircbot> LibreOffice (core) vmiklos * (3 files in 3 dirs): tdf#83300 DOCX import: 'TOC Heading' should not be 'keep with next' by default
+20:44 <@vmiklos> _rene_: thanks for testing. yes, but then my idea that perhaps the part to fix is the testcase, not the real code may be true at the end :)
+20:45 < _rene_> yeah, or how the test is run (deinit?)
+20:45 < _rene_> because it does say OK...
+20:45 < _rene_> and then SIGSEGVs ;)
+20:46 < loircbot> LibreOffice (core) [feature/glyphy] tml * external/glyphy/glyphy-windows.patch.1: Update the GLyphy patch for Windows
+20:48 <@vmiklos> _rene_: aah, actually it may be a real bug then -- IIRC lloconv has some dirty _exit() hack..
+[...]
+11:21 < _rene_> vmiklos: I think I'll revert to non-libmerged to get that test
+ fixed for beta1. I don't like having all tests disabled. can
+ live with it for a alpha, but...
+11:22 < _rene_> but merged-nonmerged-merged ping-pong is also not ideal ;)
+11:22 < bubli> tml__: No way I do :P
+11:22 < _rene_> especially as I would differentiate from official TDF builds
+ with not-libmerged..
+[...]
+11:48 <@vmiklos> _rene_: right, either revert to non-merged or patch/sed out
+ that single test for now.
+
+diff --git a/libreofficekit/Module_libreofficekit.mk b/libreofficekit/Module_libreofficekit.mk
+index 0b2fd4a..ae40d59 100644
+--- a/libreofficekit/Module_libreofficekit.mk
++++ b/libreofficekit/Module_libreofficekit.mk
+@@ -11,9 +11,9 @@ $(eval $(call gb_Module_Module,libreofficekit))
+
+ ifeq ($(OS),LINUX)
+
+-$(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\
+- CppunitTest_libreofficekit_tiledrendering \
+-))
++#$(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\
++# CppunitTest_libreofficekit_tiledrendering \
++#))
+
+ ifneq ($(ENABLE_GTK3),)
+ $(eval $(call gb_Module_add_targets,libreofficekit,\
diff --git a/patches/disable-tiledrendering-test.diff b/patches/disable-tiledrendering-test.diff
deleted file mode 100644
index 9395728..0000000
--- a/patches/disable-tiledrendering-test.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/libreofficekit/Module_libreofficekit.mk b/libreofficekit/Module_libreofficekit.mk
-index 000c2fe..6d7e1c6 100644
---- a/libreofficekit/Module_libreofficekit.mk
-+++ b/libreofficekit/Module_libreofficekit.mk
-@@ -11,9 +11,9 @@ $(eval $(call gb_Module_Module,libreofficekit))
-
- ifeq ($(OS),LINUX)
-
--$(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\
-- CppunitTest_libreofficekit_tiledrendering \
--))
-+#$(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\
-+# CppunitTest_libreofficekit_tiledrendering \
-+#))
-
- ifneq ($(ENABLE_GTK),)
- $(eval $(call gb_Module_add_targets,libreofficekit,\
diff --git a/patches/series b/patches/series
index 2815a9b..5c53ede 100644
--- a/patches/series
+++ b/patches/series
@@ -29,6 +29,5 @@ hppa-is-32bit.diff
gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
liborcus-0.9.1.diff
-disable-tiledrendering-test.diff
debian-branding.diff
icu-56.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: