diff options
author | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-07-21 19:35:13 +0200 |
---|---|---|
committer | Andrzej Hunt <andrzej@ahunt.org> | 2014-08-19 14:06:22 +0200 |
commit | ea0c7e9f2bff0669f13d427113a04810eccdd1c1 (patch) | |
tree | 9c6d671cf51af7c4995d248ea7b9c47d29546126 | |
parent | c6844b51477c92f21b9b9346065b7383388a8cb6 (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
-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 4599dae58d5b..20df9f118fe0 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -77,6 +77,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 &&)) \ @@ -172,6 +174,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)) |