diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-11-27 21:33:09 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-11-28 11:43:43 +0000 |
| commit | ee8057caaa26dcddbf80b1e0a2f02d250089d1e3 (patch) | |
| tree | 7c8f14791e05a262e45310cbad0a76ce24b01682 /solenv | |
| parent | 787d31a94510ca3de9ce582d7b7402dfca584b23 (diff) | |
add cppunit tests to gbuildtojson
Change-Id: I655190464e2b4289f5c51b194821f9288272d301
Reviewed-on: https://gerrit.libreoffice.org/31271
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/post_GbuildToJson.mk | 18 |
2 files changed, 22 insertions, 0 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 95f5fbcd0e77..1e4ed412074a 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -140,8 +140,12 @@ $(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest_get_linktarge endef +define gb_CppunitTest_register_target +endef + # call gb_CppunitTest__CppunitTest_impl,cppunittest,linktarget define gb_CppunitTest__CppunitTest_impl +$(call gb_CppunitTest_register_target, $(1), $(2), "test") $(call gb_LinkTarget_LinkTarget,$(2),CppunitTest_$(1),NONE) $(call gb_LinkTarget_set_targettype,$(2),CppunitTest) $(call gb_LinkTarget_add_libs,$(2),$(gb_STDLIBS)) diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk index 0740cf7f0b58..74322cebf044 100644 --- a/solenv/gbuild/extensions/post_GbuildToJson.mk +++ b/solenv/gbuild/extensions/post_GbuildToJson.mk @@ -61,6 +61,13 @@ $(call gb_LinkTarget_get_target,$(call gb_$(2)_get_linktarget,$(3))): $(gb_Helpe $(call gb_LinkTarget_get_target,$(call gb_$(2)_get_linktarget,$(3))): T_MAKEFILE := $(lastword $(MAKEFILE_LIST)) endef +define gb_CppunitTest_register_target +gbuildtojson : $(call gb_LinkTarget_get_target,$(2)) + +$(call gb_LinkTarget_get_target,$(2)): $(gb_Helper_MISCDUMMY) $(gb_GbuildToJson_PHONY) +$(call gb_LinkTarget_get_target,$(2)): T_MAKEFILE := $(lastword $(MAKEFILE_LIST)) +endef + gb_LinkTarget_use_static_libraries = gb_UnoApiHeadersTarget_get_target = $(gb_Helper_MISCDUMMY) gb_UnpackedTarball_get_final_target = $(gb_Helper_MISCDUMMY) @@ -111,10 +118,21 @@ $(call gb_Module_get_nonl10n_target,$(1)) : $(3) endef +define gb_Module__add_check_target_impl +$(call gb_Module__read_targetfile,$(1),$(2),check target) + +$(call gb_Module_get_check_target,$(1)) : $(3) + +endef + define gb_Module_add_target $(if $(filter Library_% Executable_%,$(2)),$(call gb_Module__add_target_impl,$(1),$(2),$$(gb_Module_CURRENTTARGET))) endef +define gb_Module_add_check_target +$(if $(filter CppunitTest_%,$(2)),$(call gb_Module__add_check_target_impl,$(1),$(2),$$(gb_Module_CURRENTTARGET))) +endef + gb_Module_add_l10n_target = gb_GbuildToJson_BLACKLISTEDMODULES := connectivity compilerplugins cli_ure dictionaries bridges helpcompiler helpcontent2 icon-themes jurt sal shell cppu cppuhelper cpputools extensions external i18npool javaunohelper jurt lingucomponent odk scaddins solenv stoc tools translations udkapi unoidl writerfilter |