[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - dbaccess/Module_dbaccess.mk

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Tue Jun 9 07:58:35 UTC 2020


 dbaccess/Module_dbaccess.mk |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 571d8bcc6c38cf508dfebebdd080b6e80a4f1efd
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Jun 4 10:41:44 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Jun 9 09:58:03 2020 +0200

    disable dbaccess_hsqldb test on macos
    
    fails 50% of the time with a core dump, and we have no way of debugging
    that
    
    Change-Id: Ieda3a241a964327d3c70a6f519a032980ce312ed
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95487
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 8ad4ec9eea1224b9bfe1f7ce28393b234c083c89)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95871
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 99073bb80a70..9a2e17281fcb 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -58,12 +58,15 @@ $(eval $(call gb_Module_add_check_targets,dbaccess,\
 	CppunitTest_dbaccess_hsqlschema_import \
 ))
 
+# this test fails 50% of the time on the mac jenkins buildbots
 ifeq ($(ENABLE_JAVA),TRUE)
+ifneq ($(OS),MACOSX)
 $(eval $(call gb_Module_add_check_targets,dbaccess,\
     CppunitTest_dbaccess_hsqldb_test \
     CppunitTest_dbaccess_RowSetClones \
 ))
 endif
+endif
 
 # This runs a suite of performance tests on embedded firebird and HSQLDB.
 # Instructions on running the test can be found in qa/unit/embeddedb_performancetest


More information about the Libreoffice-commits mailing list