strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Re-enable CppunitTest_officecfg_cppheader_test

Browse source 
Change-Id: I059a4cf6ce9f8969235cb998522461e82232502c
This commit is contained in:
Stephan Bergmann 2015-11-13 12:02:25 +01:00
parent efe694737e
commit c057e0b712
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
officecfg/CppunitTest_officecfg_cppheader_test.mk
View file

@ -13,7 +13,7 @@ $(eval $(call gb_CppunitTest_use_libraries,officecfg_cppheader_test,\
$(gb_UWINAPI) \ $(gb_UWINAPI) \
)) ))
$(eval $(call gb_CppUnitTest_use_custom_headers,officecfg_cppheader_test,\ $(eval $(call gb_CppunitTest_use_custom_headers,officecfg_cppheader_test,\
officecfg/registry \ officecfg/registry \
)) ))
@ -25,4 +25,8 @@ $(eval $(call gb_CppunitTest_use_api,officecfg_cppheader_test, \
udkapi \ udkapi \
)) ))
$(eval $(call gb_CppunitTest_use_externals,officecfg_cppheader_test, \
boost_headers \
))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

11
officecfg/Module_officecfg.mk
View file

@ -26,13 +26,8 @@ $(eval $(call gb_Module_add_targets,officecfg,\
Configuration_officecfg \ Configuration_officecfg \
)) ))
# this does not work, subsequenttest s a runtime dep, that is it postpone the run of the unittest, not the build of it $(eval $(call gb_Module_add_check_targets,officecfg,\
# and that test need a bunch of include that are not there and there is no rule to teach make about the CppunitTest_officecfg_cppheader_test \
# dependency of these generated headers ))
# disabled for now
# The cppheader test depends on comphelper so can only be a subsequentcheck:
#$(eval $(call gb_Module_add_subsequentcheck_targets,officecfg,\
# CppunitTest_officecfg_cppheader_test \
#))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4: