[Libreoffice-commits] core.git: cppcanvas/Module_cppcanvas.mk

Miklos Vajna vmiklos at collabora.co.uk
Thu Apr 10 05:08:43 PDT 2014


 cppcanvas/Module_cppcanvas.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit bcd243793ee4174d71b5e61c88d2bc79fd0d7f1d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Apr 10 14:01:03 2014 +0200

    CppunitTest_cppcanvas_emfplus: disable this in case there is no display to use
    
    This test is already disabled on non-Linux, but it fails in case there
    is no display to use. For now just disable it in that case.
    
    Change-Id: I29c52e803a1fca5f2bdeeb655c573ad8fef622e8

diff --git a/cppcanvas/Module_cppcanvas.mk b/cppcanvas/Module_cppcanvas.mk
index 62ba638..b341bc0 100644
--- a/cppcanvas/Module_cppcanvas.mk
+++ b/cppcanvas/Module_cppcanvas.mk
@@ -30,9 +30,11 @@ $(eval $(call gb_Module_add_check_targets,cppcanvas,\
     CppunitTest_cppcanvas_test \
 ))
 
+ifneq ($(DISPLAY),)
 $(eval $(call gb_Module_add_slowcheck_targets,cppcanvas,\
     CppunitTest_cppcanvas_emfplus \
 ))
 endif
+endif
 
 # vim: set noet sw=4 ts=4:


More information about the Libreoffice-commits mailing list