- Add patch to disable flaky hsqldb test:

* disable-flaky-hsqldb-test.patch

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=337
This commit is contained in:
Tomáš Chvátal 2015-10-21 11:14:02 +00:00 committed by Git OBS Bridge
parent 45646b91c0
commit 8424fdd368
3 changed files with 26 additions and 0 deletions

View File

@ -0,0 +1,17 @@
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 200dea0..1f10c00 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -49,12 +49,6 @@ $(eval $(call gb_Module_add_check_targets,dbaccess,\
CppunitTest_dbaccess_RowSetClones) \
))
-ifeq ($(ENABLE_JAVA),TRUE)
-$(eval $(call gb_Module_add_check_targets,dbaccess,\
- CppunitTest_dbaccess_hsqldb_test \
-))
-endif
-
# This runs a suite of peformance tests on embedded firebird and HSQLDB.
# Instructions on running the test can be found in qa/unit/embeddedb_performancetest
ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 21 11:13:33 UTC 2015 - tchvatal@suse.com
- Add patch to disable flaky hsqldb test:
* disable-flaky-hsqldb-test.patch
-------------------------------------------------------------------
Fri Oct 16 08:04:32 UTC 2015 - tchvatal@suse.com

View File

@ -155,6 +155,8 @@ Source2061: %{external_url}/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.t
Source2062: %{external_url}/language-subtag-registry-2015-06-08.tar.bz2
# Make for old distros where too old gnumake resides
Source3000: http://ftp.gnu.org/gnu/make/make-4.1.tar.bz2
# PATCH-FIX-SUSE: disable really fragile test run on hsqldb
Patch0: disable-flaky-hsqldb-test.patch
# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
# to avoid BerkleyDB incompatibility with the plain build
# FIXME: make it configurable and push upstream
@ -986,6 +988,7 @@ Provides additional %{langname} translations and resources for %{project}. \
%prep
%setup -q -b1 -b2
%patch0 -p1
%patch1
%patch3 -p1
%patch4