diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-19 12:16:42 +0200 |
---|---|---|
committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-03 06:46:24 +0100 |
commit | fb308c193bc9f0d07ad2cccd5a0b239f86cbe442 (patch) | |
tree | 11cbb10810a968567b3c215efb353acb4ca23194 /dbaccess | |
parent | 6ac1e9e7f0be23b529992c268d2c563fe40fff76 (diff) |
Fix --disable-scripting for DESKTOP build
Unfortunatly we cannot add --disable-scripting to
sub_conf_defaults, because Java currently has no
equivalent to the PYTHON_FOR_BUILD setting.
Change-Id: I89938a17307a363f5de808200914940503312829
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126186
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/Module_dbaccess.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk index 2d2c9ae31c1b..436f591c7a07 100644 --- a/dbaccess/Module_dbaccess.mk +++ b/dbaccess/Module_dbaccess.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Module_add_check_targets,dbaccess,\ )) endif +ifneq ($(filter SCRIPTING,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_check_targets,dbaccess,\ CppunitTest_dbaccess_dialog_save \ CppunitTest_dbaccess_empty_stdlib_save \ @@ -54,6 +55,7 @@ $(eval $(call gb_Module_add_check_targets,dbaccess,\ CppunitTest_dbaccess_macros_test \ CppunitTest_dbaccess_hsqlschema_import \ )) +endif # this test fails 50% of the time on the mac jenkins buildbots ifeq ($(ENABLE_JAVA),TRUE) |