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.

1 files changed, 11 insertions, 1 deletions

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;
     }