[libreoffice] 02/05: remove checkBookmarks test disabling, should work now according to upstream
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 036d36cfb72b371d8e360a7af75667781ba22788
Author: Rene Engelhard <rene@debian.org>
Date: Tue Nov 17 12:52:56 2015 +0100
remove checkBookmarks test disabling, should work now according to upstream
Conflicts:
patches/disable-flaky-tests.diff
---
changelog | 8 ++++---
patches/disable-flaky-tests.diff | 50 ----------------------------------------
2 files changed, 5 insertions(+), 53 deletions(-)
diff --git a/changelog b/changelog
index 4a538af..2fd7df7 100644
--- a/changelog
+++ b/changelog
@@ -4,9 +4,11 @@ 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
+ * debian/patches/disable-flaky-tests.diff:
+ - disable also libreofficekit_tiledrendering as it SIGSEGVs after OK
+ (but lloconv works) with merged libs
+ - remove checkBookmarks disabling, should work now according to
+ upstream
-- Rene Engelhard <rene@debian.org> Mon, 02 Nov 2015 23:02:09 +0100
diff --git a/patches/disable-flaky-tests.diff b/patches/disable-flaky-tests.diff
index 2562906..59bc6da 100644
--- a/patches/disable-flaky-tests.diff
+++ b/patches/disable-flaky-tests.diff
@@ -43,56 +43,6 @@ index 4ececd9..5eda25a 100644
# -o sc.ScAnnotationObj
# -o sc.ScAnnotationShapeObj
-08:54 <@_rene_> vmiklos:
-http://zyklop.dyndns.org/~rene/libreoffice_4.2.4~rc1~git20140414-1_amd64.build.sw_complex. -4-2 from yesterday evening
-08:55 <@_rene_> vmiklos: tl;dr: sw_complex fails
-[...]
-09:25 <@vmiklos> _rene_: i would recommend disabling the checkBookmarks part in
- your builds, it's clearly not stable enough to invoke it from
- a packaging script.
-09:26 <@_rene_> vmiklos: ok, ooc, why? fails sometimes(tm) even for you?
-09:26 < tml> sberg: I hate to say this, but maybe we need to take a step
- backwards and introduce some macro to initialise OUStrings...?
-09:26 < tml> s/need/would need
-09:27 <@_rene_> why is it then either not fixed or disabled for everyone? I
- mean, if I patch it now and it gets fixed somewhen I'd stil
- have it disabled...
-09:27 -!- arranna [~ronkko@a88-114-229-111.elisa-laajakaista.fi] has joined
- #libreoffice-dev
-09:27 < loircbot> LibreOffice (core) sbergman * sd/ (inc/randomnode.hxx
- source/ui/unoidl/randomnode.cxx): Fix symbol visibility
-09:28 <@vmiklos> _rene_: yes, it fails here as well sometimes. the test
- generates random bookmarks.
-[...]
-09:43 <@vmiklos> i might be wrong, but i don't think the checkBookmarks test
- was ever stable. if it was stable on 4-1 for you, you're just
- lucky :)
-
-diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
-index e9b344c..ffc94f7 100644
---- a/sw/JunitTest_sw_complex.mk
-+++ b/sw/JunitTest_sw_complex.mk
-@@ -28,7 +28,6 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sw_complex,\
- sw/qa/complex/accessibility/AccessibleRelationSet \
- sw/qa/complex/checkColor/CheckChangeColor \
- sw/qa/complex/indeterminateState/CheckIndeterminateState \
-- sw/qa/complex/writer/CheckBookmarks \
- sw/qa/complex/writer/CheckCrossReferences \
- sw/qa/complex/writer/CheckFlies \
- sw/qa/complex/writer/CheckIndexedPropertyValues \
-@@ -58,11 +57,4 @@ $(eval $(call gb_JunitTest_add_classes,sw_complex,\
- complex.writer.TextPortionEnumerationTest \
- ))
-
--# FIXME has never worked on windows, hashes are different
--ifneq ($(OS),WNT)
--$(eval $(call gb_JunitTest_add_classes,sw_complex,\
-- complex.writer.CheckBookmarks \
--))
--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/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: