diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-03 11:13:32 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-09 10:16:11 +0100 |
commit | 3687ae6f033f808f678345af3eb649a8e2b2e72d (patch) | |
tree | 3830b5790d9ef6f5a61fe8850af60a36c7132a1a /libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk | |
parent | b99e0ddfe1cb6657d9eb796452b1ddb9f5772866 (diff) |
CppunitTest_libreofficekit_tiledrendering: fix up and enable this again
The main problem was that UserInstallation did not point to the usual
workdir/unittest/, so initialization failed early, not finding the
soffice.cfg directory under
workdir/CppunitTest/libreofficekit_tiledrendering.test.user/.
Disable one testcase that still fails, though.
Change-Id: I3fdae5ead47dd2a805a0ed8d3cb407938f868e3b
Diffstat (limited to 'libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk')
-rw-r--r-- | libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk b/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk index acc708ff8abe..783074fc455c 100644 --- a/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk +++ b/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk @@ -29,8 +29,6 @@ $(eval $(call gb_CppunitTest_use_libraries,libreofficekit_tiledrendering, \ $(gb_UWINAPI) \ )) -# unotest \ - ifeq ($(OS),LINUX) $(eval $(call gb_CppunitTest_add_libs,libreofficekit_tiledrendering,\ -lm \ @@ -42,13 +40,10 @@ endif $(eval $(call gb_CppunitTest_use_sdk_api,libreofficekit_tiledrendering)) $(eval $(call gb_CppunitTest_use_ure,libreofficekit_tiledrendering)) -#$(eval $(call gb_CppunitTest_use_vcl,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)) -$(eval $(call gb_CppunitTest_use_confpreinit,libreofficekit_tiledrendering)) - # vim: set noet sw=4 ts=4: |