diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-02-27 19:05:54 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-02-27 19:33:07 +0100 |
| commit | f0a60415597bae7ca54767b397a217882578ce97 (patch) | |
| tree | 353c68981f745ba4be44042b64934b063f220bf2 /solenv | |
| parent | 5f444791fbae38ad69a0497a074e2411da8cbb0f (diff) | |
gbuild: CppunitTest: always use unittest configuration
The sc_subsequent_filters_test was failing because of a lock file
because it did not use the unittest configuration.
Refactor gb_CppunitTest_use_configuration so it uses both the instdir
and unittest configuration to prevent such errors.
In case there ever is a test that does not work with the unittest
configuration it should call gb_CppunitTest_use_instdir_configuration.
Change-Id: Ibc00d42f8b6102d50d922f51173120798fa45c6e
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index bc1aa067d670..f7c857713cbe 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -273,8 +273,8 @@ $(call gb_CppunitTest_get_target,$(1)) : CONFIGURATION_LAYERS += $(2):$(call gb_ endef -# Use standard configuration. -define gb_CppunitTest_use_configuration +# Use instdir configuration +define gb_CppunitTest_use_instdir_configuration $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,postprocess_registry) $(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(INSTROOT)/$(LIBO_SHARE_FOLDER)/registry) @@ -287,6 +287,13 @@ $(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(WORKDIR)/unittest/registr endef +# Use standard configuration: instdir config + unittest config (in this order!) +define gb_CppunitTest_use_configuration +$(call gb_CppunitTest_use_instdir_configuration,$(1)) +$(call gb_CppunitTest_use_unittest_configuration,$(1)) + +endef + define gb_CppunitTest_use_executable $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Executable_get_target,$(2)) |