This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit eebd63434bba9a399b064f8204dc5ca51e8ae028
Author: Rene Engelhard <r...@debian.org>
Date: Mon Mar 14 11:48:17 2016 +0100
git update; update disable-flaky-tests.diff
---
changelog | 2 +-
patches/disable-flaky-tests.diff | 55 ++++++++++++++++++++++++++++++++--------
2 files changed, 45 insertions(+), 12 deletions(-)
diff --git a/changelog b/changelog
index ace72fd..26d9776 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.1.2~rc1~git20160307-1) UNRELEASED; urgency=medium
+libreoffice (1:5.1.2~rc1~git20160314-1) UNRELEASED; urgency=medium
* New upstream snapshot
- -sdbc-postgresql: use proper schema name for type names
diff --git a/patches/disable-flaky-tests.diff b/patches/disable-flaky-tests.diff
index 6aef195..b93f605 100644
--- a/patches/disable-flaky-tests.diff
+++ b/patches/disable-flaky-tests.diff
@@ -110,24 +110,57 @@ index 0b2fd4a..ae40d59 100644
12:22 < chris_wot> I'll ping the ML
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-index 6463c80..3927ac4 100644
+index 54eed4d..78019bd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-@@ -1103,7 +1103,7 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675,
"no-numlevel-but-indented.odt")
+@@ -1103,28 +1103,28 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675,
"no-numlevel-but-indented.odt")
assertXPath(pXmlDoc, "//w:ind", "start", "1418");
}
-DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt")
-+/*DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape,
"flip_and_rotate.odt")
- {
- xmlDocPtr pXmlDoc = parseExport("word/document.xml");
- if (!pXmlDoc)
-@@ -1120,7 +1120,7 @@ DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape,
"flip_and_rotate.odt")
- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y",
"3171");
- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x",
"1695");
- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y",
"1701");
+-{
+- xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+- if (!pXmlDoc)
+- return;
+- // there should be no flipH and flipV attributes in this case
+- assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH");
+- assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV");
+- // check rotation angle
+- assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000");
+- // check the first few coordinates of the polygon
+-#ifndef MACOSX /* Retina-reatled rounding rountrip error
+- * hard to smooth out due to the use of string compare
+- * instead of number */
+- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x",
"2351");
+- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y",
"3171");
+- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x",
"1695");
+- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y",
"3171");
+- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x",
"1695");
+- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y",
"1701");
+-#endif
-}
-+}*/
++//DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape,
"flip_and_rotate.odt")
++//{
++// xmlDocPtr pXmlDoc = parseExport("word/document.xml");
++// if (!pXmlDoc)
++// return;
++// // there should be no flipH and flipV attributes in this case
++// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH");
++// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV");
++// // check rotation angle
++// assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000");
++// // check the first few coordinates of the polygon
++//#ifndef MACOSX /* Retina-reatled rounding rountrip error
++// * hard to smooth out due to the use of string compare
++// * instead of number */
++// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt",
"x", "2351");
++// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt",
"y", "3171");
++// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt",
"x", "1695");
++// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt",
"y", "3171");
++// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt",
"x", "1695");
++// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt",
"y", "1701");
++//#endif
++//}
#endif
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
