[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.1-1-28-gc709781
The following commit has been merged in the debian-experimental-3.7 branch:
commit 2705779fcb373b620e9e2888b2251d8a90353ac1
Author: Rene Engelhard <rene@debian.org>
Date: Wed Sep 5 19:39:55 2012 +0200
debian/patches/disable-flaky-unoapi-tests.diff: disable flaky toolkit unapi tests
diff --git a/changelog b/changelog
index 1da15ab..a897552 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,8 @@ libreoffice (1:3.7.0~git20120814-1) UNRELEASED; urgency=low
libreoffice (1:3.6.1-3) UNRELEASED; urgency=low
+ * debian/patches/disable-flaky-unoapi-tests.diff: disable flaky
+ toolkit unapi tests
* debian/patches/gcj-safe-jni-h-include.diff: add missing -I...
-- Rene Engelhard <rene@rene-engelhard.de> Wed, 05 Sep 2012 14:26:21 +0200
diff --git a/patches/disable-flaky-unoapi-tests.diff b/patches/disable-flaky-unoapi-tests.diff
new file mode 100644
index 0000000..5d47916
--- /dev/null
+++ b/patches/disable-flaky-unoapi-tests.diff
@@ -0,0 +1,18 @@
+14:13 < mst__> _rene_, the toolkit unoapi tests are known to be flaky (in some
+ system dependent way) e.g. on the Win@6 tinderbox it always
+ crashes
+
+--- a/toolkit/Module_toolkit.mk-old 2012-09-05 14:24:27.129693868 +0200
++++ b/toolkit/Module_toolkit.mk 2012-09-05 14:24:39.521755312 +0200
+@@ -35,8 +35,8 @@
+ Package_util \
+ ))
+
+-$(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\
+- JunitTest_toolkit_unoapi \
+-))
++#$(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\
++# JunitTest_toolkit_unoapi \
++#))
+
+ # vim: set noet sw=4 ts=4:
diff --git a/patches/series b/patches/series
index e4dcc49..0a54884 100644
--- a/patches/series
+++ b/patches/series
@@ -27,3 +27,4 @@ ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
#disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
kfreebsd-add-missing-P_SEP.diff
+disable-flaky-unoapi-tests.diff
--
LibreOffice packaging repository
Reply to: