[libreoffice] 05/06: also disable svx.AccessibleShape and apply disable-flaky-tests.diff in junit-subsequentcheck test

[Rene Engelhard]

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

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

commit 88cd4999aeb15a244a8111c06b2841657037333e
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Dec 19 18:02:58 2016 +0100

    also disable svx.AccessibleShape and apply disable-flaky-tests.diff in junit-subsequentcheck test
---
 changelog                        |  3 +++
 patches/disable-flaky-tests.diff | 13 +++++++++++++
 tests/junit-subsequentcheck      |  3 +++
 3 files changed, 19 insertions(+)

diff --git a/changelog b/changelog
index 08c2a38..21f8d80 100644
--- a/changelog
+++ b/changelog
@@ -6,12 +6,15 @@ libreoffice (1:5.2.4-1) unstable; urgency=medium
     (without the glew->epoxy move) backported from master to rework Diamond
     slide transition to use only OpenGL core (all we have in gtk3) and fix
     ogltrans generically with gtk3
+  * debian/patches/disable-flaky-tests.diff: also disable svx.AccessibleShape
 
   * debian/rules:
     - MYSQL_FLAVOUR=mysql on jessie-backports
     - ENABLE_GDRIVE=y also on armhf and arm64 as we've chromium there now, too
   * debian/control.ogltrans.in:
     - add Conflicts: libreoffice-gtk3 (<< 1:5.2.4~rc2)
+  * debian/tests/junit-subsequentcheck:
+    - apply disable-flaky-tests.diff
 
  -- Rene Engelhard <rene at debian.org>  Mon, 19 Dec 2016 13:52:51 +0100
 
diff --git a/patches/disable-flaky-tests.diff b/patches/disable-flaky-tests.diff
index dcef95c..fc9ae53 100644
--- a/patches/disable-flaky-tests.diff
+++ b/patches/disable-flaky-tests.diff
@@ -164,3 +164,16 @@ index 54eed4d..78019bd 100644
  
  DECLARE_OOXMLEXPORT_TEST(testTdf103389, "tdf103389.docx")
  {
+diff --git a/svx/qa/unoapi/svx.sce b/svx/qa/unoapi/svx.sce
+index 1c3925f..a16f001 100644
+--- a/svx/qa/unoapi/svx.sce
++++ b/svx/qa/unoapi/svx.sce
+@@ -25,7 +25,7 @@
+ #i111216 -o svx.AccessiblePresentationGraphicShape
+ #i111216 -o svx.AccessiblePresentationOLEShape
+ #i85539 -o svx.AccessiblePresentationShape
+--o svx.AccessibleShape
++#-o svx.AccessibleShape
+ #i90294 -o svx.GraphicExporter
+ -o svx.SvxDrawPage
+ #i85501 -o svx.SvxGraphCtrlAccessibleContext
diff --git a/tests/junit-subsequentcheck b/tests/junit-subsequentcheck
index a0ec91d..3d4a234 100755
--- a/tests/junit-subsequentcheck
+++ b/tests/junit-subsequentcheck
@@ -14,6 +14,9 @@ WORKDIR=`mktemp -d`
 echo "====== Patching the tree to only build Java-based unittests against an existing installation ======"
 patch -p1 < ./debian/tests/patches/java-subsequentcheck-standalone.diff
 
+echo "====== Disabling (flaky) tests ======="
+patch -p1 < ./debian/patches/disable-flaky-tests.diff
+
 echo
 echo "====== Generating configuration ======="
 rm -f config_host.mk

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