diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-31 16:51:35 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-31 16:51:35 +0100 |
| commit | a334403eb22f3d812549b5ce9b390fecdee9be31 (patch) | |
| tree | badbed131a228b1a8cbbfb50cde979884f0a2919 /sc/CppunitTest_sc_macros_test.mk | |
| parent | 983360d3bed84981650adfb30e2759bf6fa30e61 (diff) | |
Cleaned up configmgr initialization.
Added CONFIGURATION_LAYERS bootstrap variable.
Removed OOO_CONFIG_REGISTRY[_EXTRA]_DIR bootstrap variables.
Diffstat (limited to 'sc/CppunitTest_sc_macros_test.mk')
| -rw-r--r-- | sc/CppunitTest_sc_macros_test.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index 0da63485bfe7..5d39769a3f15 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -99,9 +99,9 @@ $(eval $(call gb_CppunitTest_add_service_rdbs,sc_macros_test,\ $(eval $(call gb_CppunitTest_set_args,sc_macros_test,\ --headless \ --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ - -env:OOO_CONFIG_REGISTRY_DIR=$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) \ - -env:OOO_CONFIG_REGISTRY_EXTRA_DIR=$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/user) \ + "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/unittest/user)" \ )) + # .../spool is required for the (somewhat strange) filter configuration # we need to # a) explicitly depend on library msword because it is not implied by a link |