[Libreoffice-commits] core.git: sc/Module_sc.mk sd/Module_sd.mk sw/Module_sw.mk

Markus Mohrhard markus.mohrhard at googlemail.com
Tue May 2 20:19:07 UTC 2017


 sc/Module_sc.mk |    2 ++
 sd/Module_sd.mk |    2 ++
 sw/Module_sw.mk |    2 ++
 3 files changed, 6 insertions(+)

New commits:
commit 9999d9ee61f0adda79ef0886fdf487b5ec01e8e7
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue May 2 19:57:53 2017 +0200

    disable the tiledrendering tests in the headless build mode
    
    This was pointed out by the Random Config tb.
    
    Change-Id: I8a4f70d6661178f2671e4e3588f5873c64885c07
    Reviewed-on: https://gerrit.libreoffice.org/37175
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index ef82147d781b..4ab8f50489e7 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -44,11 +44,13 @@ $(eval $(call gb_Module_add_check_targets,sc,\
 	CppunitTest_sc_core \
 ))
 
+ifneq ($(ENABLE_HEADLESS),TRUE)
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Module_add_check_targets,sc,\
     CppunitTest_sc_tiledrendering \
 ))
 endif
+endif
 
 $(eval $(call gb_Module_add_slowcheck_targets,sc, \
 	CppunitTest_sc_condformats \
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 62bfd8988778..dde16d7c4c40 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -39,12 +39,14 @@ $(eval $(call gb_Module_add_check_targets,sd,\
 ))
 endif
 
+ifneq ($(ENABLE_HEADLESS),TRUE)
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Module_add_check_targets,sd,\
     CppunitTest_sd_svg_export_tests \
     CppunitTest_sd_tiledrendering \
 ))
 endif
+endif
 
 # screenshots
 $(eval $(call gb_Module_add_screenshot_targets,sd, \
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 8ef8a26fcf04..a003ae57c454 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -79,11 +79,13 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
     CppunitTest_sw_globalfilter \
 ))
 
+ifneq ($(ENABLE_HEADLESS),TRUE)
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Module_add_slowcheck_targets,sw,\
     CppunitTest_sw_tiledrendering \
 ))
 endif
+endif
 
 ifneq ($(DISABLE_CVE_TESTS),TRUE)
 $(eval $(call gb_Module_add_slowcheck_targets,sw,\


More information about the Libreoffice-commits mailing list