diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-02-27 19:05:54 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-03-04 10:21:01 +0000 |
| commit | 9c5ea0469ab96bd39cccd3bd60d79846ce065679 (patch) | |
| tree | 70acedb6b5b7674ed24a19961985b75b0df3f780 /solenv | |
| parent | d82a249a6fc8c7c34db5215428b97fede4876461 (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.
(cherry picked from commit f0a60415597bae7ca54767b397a217882578ce97)
Conflicts:
dbaccess/CppunitTest_dbaccess_RowSetClones.mk
sc/CppunitTest_sc_condformats.mk
sc/CppunitTest_sc_recordchanges.mk
Change-Id: Ibc00d42f8b6102d50d922f51173120798fa45c6e
Reviewed-on: https://gerrit.libreoffice.org/14738
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
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 4f00f819864c..00256b406636 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -265,8 +265,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) @@ -279,6 +279,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)) |