[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.1_rc1-2-179-g36f27eb
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 26eacde7895decfc36d3007e1be68f3376b7c4f6
Author: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Wed Mar 6 12:49:37 2013 +0100
disable flaky tests for now
diff --git a/changelog b/changelog
index fbf3802..b89e0e0 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,6 @@
libreoffice (1:4.0.1-0ubuntu1) raring; urgency=low
+ [ Bjoern Michaelsen ]
* new upstream release candidate
* add transitionals for -presenter-console and -binfilter
* add sessioninstaller for remaining wizards (LP: #780399)
@@ -59,7 +60,12 @@ libreoffice (1:4.0.1-0ubuntu1) raring; urgency=low
- promote Breaks to Conflicts from langpacks against en-US
- remove Breaks against -style-industrial which is long gone
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 06 Mar 2013 09:10:20 +0100
+ [ Rico Tzschichholz ]
+ * disable two more flaky tests for now:
+ - fdo#35663
+ - fdo#61896
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 06 Mar 2013 12:46:25 +0100
libreoffice (1:4.0.1~rc1-2) experimental; urgency=low
diff --git a/patches/fdo-35663.diff b/patches/fdo-35663.diff
new file mode 100644
index 0000000..a933878
--- /dev/null
+++ b/patches/fdo-35663.diff
@@ -0,0 +1,18 @@
+Description: Disable failing test for now, Heisenbug, only on amd64 it seems
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=35663
+Forwarded: not-needed
+Author: Rico Tzschichholz <ricotz@ubuntu.com>
+Last-Update: 2013-03-06
+
+diff --git a/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk
+index cb77929..25a1405 100644
+--- a/sfx2/JunitTest_sfx2_complex.mk
++++ b/sfx2/JunitTest_sfx2_complex.mk
+@@ -57,7 +57,6 @@ $(eval $(call gb_JunitTest_add_classes,sfx2_complex,\
+ complex.sfx2.DocumentProperties \
+ complex.sfx2.DocumentMetadataAccess \
+ complex.sfx2.DocumentEvents \
+- complex.sfx2.UndoManager \
+ ))
+ # fd#35663 fails currently:
+ # complex.sfx2.UndoManager \
diff --git a/patches/fdo-61896.diff b/patches/fdo-61896.diff
new file mode 100644
index 0000000..a8129f5
--- /dev/null
+++ b/patches/fdo-61896.diff
@@ -0,0 +1,17 @@
+Description: Disable failing test for now, Heisenbug, only on amd64 it seems
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=61896
+Forwarded: not-needed
+Author: Rico Tzschichholz <ricotz@ubuntu.com>
+Last-Update: 2013-03-06
+
+--- libreoffice-4.0.1~rc1/chart2/qa/unoapi/sch.sce 2013-02-19 18:39:40.000000000 +0100
++++ libreoffice-4.0.1~rc1/chart2/qa/unoapi/sch.sce 2013-03-03 16:54:46.192149252 +0100
+@@ -35,7 +35,7 @@
+ -o sch.ChXChartView
+ -o sch.ChXDataPoint
+ #i83868 -o sch.ChXDataRow
+--o sch.ChXDiagram
++#fdo61896 -o sch.ChXDiagram
+ -o sch.ChartArea
+ -o sch.ChartGrid
+ -o sch.ChartLegend
diff --git a/patches/series b/patches/series
index 5ac0849..5c62cec 100644
--- a/patches/series
+++ b/patches/series
@@ -30,3 +30,5 @@ wheezy-backports-python.diff
we-need-libcmis-0.3.1.diff
lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
lp-780399-sessioninstaller-for-remaining-java-wizards.diff
+fdo-35663.diff
+fdo-61896.diff
--
LibreOffice packaging repository
Reply to: