[libreoffice] 01/02: CppunitTest_libreofficekit_tiledrendering is now disabled upstream, too...

[Rene Engelhard]

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

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

commit 9a79f2225a161767c9c0cce38f7ccc577db106e7
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Oct 23 13:42:53 2017 +0000

    CppunitTest_libreofficekit_tiledrendering is now disabled upstream, too...
---
 changelog                        |  2 +-
 patches/disable-flaky-tests.diff | 41 ----------------------------------------
 2 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/changelog b/changelog
index 3f07d6f..d0b057a 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:6.0.0~beta1~git20171020-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~beta1~git20171023-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
diff --git a/patches/disable-flaky-tests.diff b/patches/disable-flaky-tests.diff
index ee2f68b..2840cec 100644
--- a/patches/disable-flaky-tests.diff
+++ b/patches/disable-flaky-tests.diff
@@ -56,47 +56,6 @@ index dbfc3e1..d235c5d 100644
  # -o sc.ScAnnotationObj
  # -o sc.ScAnnotationShapeObj
 
-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))
-     CppunitTest_libreofficekit_checkapi \
- ))
- 
--$(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,\
-
 12:18 < _rene_> chris_wot: ping?
 12:18 < chris_wot> heya
 12:18 < chris_wot> you pinged?

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