[Libreoffice-commits] core.git: toolkit/Module_toolkit.mk

Michael Stahl mstahl at redhat.com
Mon Jan 8 15:18:18 UTC 2018


 toolkit/Module_toolkit.mk |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit c46ab19bcab9151744527978742eeb5e34d2effe
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Jan 8 16:14:37 2018 +0100

    toolkit: disable the UnitConversion test only on WNT
    
    The Mac problem cited in 43dd63898c145ebeb918f1d6ce094cf5c68548c8
    is unrelated.
    
    Change-Id: I2cba950d1b6df356fb5ecffdfe9d1f686f895ef4

diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk
index 74a9d5d78ffc..21fd5ae92cdc 100644
--- a/toolkit/Module_toolkit.mk
+++ b/toolkit/Module_toolkit.mk
@@ -23,9 +23,12 @@ $(eval $(call gb_Module_add_targets,toolkit,\
     Library_tk \
 ))
 
-#$(eval $(call gb_Module_add_check_targets,toolkit,\
-#    CppunitTest_toolkit \
-#))
+# FIXME fails on some tinderboxes, needs investigation
+ifneq ($(OS),WNT)
+$(eval $(call gb_Module_add_check_targets,toolkit,\
+    CppunitTest_toolkit \
+))
+endif
 
 ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\


More information about the Libreoffice-commits mailing list