diff options
author | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-07-21 19:35:13 +0200 |
---|---|---|
committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-12-04 12:23:01 +0100 |
commit | b1646178d84bca6fc8cf3310b4c61560ec856f33 (patch) | |
tree | 1c609181b1c8e8221213e816390e7a101e896a30 /solenv | |
parent | 5acadbfb0c79fe51f8025b065b46b0ccd25c804d (diff) |
Add gb_CppunitTest_use_confpreinit:
For unit tests that use the VCL event loop we can use this to
avoid the otherwise required restart.
Change-Id: I48265d7e7188a4efaa6f87432c762320331c0c78
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/gbuild/CppunitTest.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 4f00f819864c..4e3d54aac6d4 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -82,6 +82,8 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTDEPS) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ rm -fr $@.user && mkdir $@.user && \ + $(if $(gb_CppunitTest__use_confpreinit), \ + $(INSTDIR)/program/lokconf_init $(call gb_CppunitTest__make_args) &&) \ $(if $(gb_CppunitTest__interactive),, \ $(if $(value gb_CppunitTest_postprocess), \ rm -fr $@.core && mkdir $@.core && cd $@.core &&)) \ @@ -177,6 +179,12 @@ endif endef +define gb_CppunitTest_use_confpreinit +$(call gb_CppunitTest_use_executable,$(1),lokconf_init) +$(call gb_CppunitTest_get_target,$(1)) : gb_CppunitTest__use_confpreinit := TRUE + +endef + define gb_CppunitTest_use_vcl $(call gb_CppunitTest__use_vcl,$(1),$(true)) |