From 8e68391fc99b34702d76526e6b3ab4720ac017e4 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Wed, 26 Oct 2011 19:05:50 +0100 Subject: more tweaks to unittests, also move registrymodifications.xcu registrymodifications.xcu has been moved to the solver ( unittest/user/data ) new OOO_CONFIG_REGISTRY_EXTRA_DIR env var will be used to specify the directory 'data' will be contained in so we can override various config items. --- configmgr/source/components.cxx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'configmgr/source') diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx index f6257b6cdbf4..0549f8a14c93 100644 --- a/configmgr/source/components.cxx +++ b/configmgr/source/components.cxx @@ -520,7 +520,17 @@ Components::Components( parseXcsXcuLayer( 0, aUnitTestDir ); // next is required for the (somewhat strange) filter configuration parseModuleLayer( 1, aUnitTestDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/spool"))); - parseModificationLayer(); + // allow a directory to be specified to allow extra configuration to be stored + // for example to place a registrymodifications.xcu to override some configuration + rtl::OUString extra; + if (rtl::Bootstrap::get( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + "OOO_CONFIG_REGISTRY_EXTRA_DIR")), + extra)) + { + parseXcsXcuLayer(3, extra); + } return; } -- cgit