diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-09-27 09:41:09 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-01 10:54:14 +0000 |
| commit | e1b51e7beb7f9cfa7b574b9c2a69799e62963a09 (patch) | |
| tree | 70e4cc24b42b10bba4d42ffa90f19f3ada6ae1bb /solenv/gbuild/CppunitTest.mk | |
| parent | e8c8f02ffd6988ea72141992b1f26f9c5d918af5 (diff) | |
gbuild: use .xcd configuration files from instdir
..instead of .xcu files in solver/*/xml/registry
when running unittests and gengal.
Change-Id: I390a6c531d653acca7ef3379c49fe65fcb8f3c2a
Reviewed-on: https://gerrit.libreoffice.org/6057
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'solenv/gbuild/CppunitTest.mk')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index d205e0073a15..e281ffd6370c 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -283,8 +283,8 @@ endef # Use standard configuration. define gb_CppunitTest_use_configuration -$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Configuration_get_target,registry) -$(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(gb_Configuration_registry)) +$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,postprocess_registry) +$(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(INSTDIR)/$(LIBO_SHARE_FOLDER)/registry) endef @@ -293,20 +293,6 @@ $(call gb_CppunitTest_get_target,$(1)) : HEADLESS= endef -# Use configuration for filters. -# -# Okay, this is not exactly true, because there may be configuration -# for more things than just filters in spool, but it is good enough. -define gb_CppunitTest_use_filter_configuration -$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Configuration_get_target,fcfg_langpack) -$(call gb_CppunitTest__use_configuration,$(1),module,$(gb_Configuration_registry)/spool) - -endef - -define gb_CppunitTest_use_extra_configuration -$$(call gb_Output_error,gb_CppunitTest_use_extra_configuration: use gb_CppunitTest_use_unittest_configuration instead.)) -endef - # Use configuration in $(OUTDIR)/unittest/registry. define gb_CppunitTest_use_unittest_configuration $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,test_unittest) |