[Libreoffice-commits] core.git: libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk libreofficekit/Module_libreofficekit.mk libreofficekit/qa

[Stephan Bergmann]

 libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk |   11 -----------
 libreofficekit/Module_libreofficekit.mk                     |    2 +-
 libreofficekit/qa/unit/tiledrendering.cxx                   |    5 -----
 3 files changed, 1 insertion(+), 17 deletions(-)

New commits:
commit b7e1bfefeef372834d4b335820d654e0557c6834
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Mar 10 18:14:43 2015 +0100

    Fix CppunitTest_libreofficekit_tiledrendering dependencies
    
    Remove the unnecessary ones, but make sure that e.g. the sofficeapp library is
    built (which was not covered by depending on services.rdb).
    
    Change-Id: I1adfa4aaaf60787c944d71cc289cdafba8351c1b

diff --git a/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk b/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
index 783074f..5b1727e 100644
--- a/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
+++ b/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
@@ -21,11 +21,7 @@ $(eval $(call gb_CppunitTest_use_external,libreofficekit_tiledrendering,boost_he
 # our test specifically tests LOK only functionality which would otherwise not
 # require any normal LO api/libraries.
 $(eval $(call gb_CppunitTest_use_libraries,libreofficekit_tiledrendering, \
-	cppu \
 	sal \
-	tl \
-	test \
-	vcl \
 	$(gb_UWINAPI) \
 ))
 
@@ -37,13 +33,6 @@ $(eval $(call gb_CppunitTest_add_libs,libreofficekit_tiledrendering,\
 ))
 endif
 
-$(eval $(call gb_CppunitTest_use_sdk_api,libreofficekit_tiledrendering))
-
-$(eval $(call gb_CppunitTest_use_ure,libreofficekit_tiledrendering))
-
-# Depend on ~everything, as tiled rendering can use most parts of LO.
-$(eval $(call gb_CppunitTest_use_rdb,libreofficekit_tiledrendering,services))
-
 $(eval $(call gb_CppunitTest_use_configuration,libreofficekit_tiledrendering))
 
 # vim: set noet sw=4 ts=4:
diff --git a/libreofficekit/Module_libreofficekit.mk b/libreofficekit/Module_libreofficekit.mk
index ad2064f..000c2fe 100644
--- a/libreofficekit/Module_libreofficekit.mk
+++ b/libreofficekit/Module_libreofficekit.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Module_Module,libreofficekit))
 
 ifeq ($(OS),LINUX)
 
-$(eval $(call gb_Module_add_slowcheck_targets,libreofficekit,\
+$(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\
     CppunitTest_libreofficekit_tiledrendering \
 ))
 
diff --git a/libreofficekit/qa/unit/tiledrendering.cxx b/libreofficekit/qa/unit/tiledrendering.cxx
index 7dcd6fb..4e13f08 100644
--- a/libreofficekit/qa/unit/tiledrendering.cxx
+++ b/libreofficekit/qa/unit/tiledrendering.cxx
@@ -16,11 +16,6 @@
 #include <string>
 #include <stdio.h>
 
-#include <sal/types.h>
-#include <tools/stream.hxx>
-#include <vcl/salbtype.hxx>
-#include <vcl/bmpacc.hxx>
-#include <vcl/pngwrite.hxx>
 #include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>