From 8e68391fc99b34702d76526e6b3ab4720ac017e4 Mon Sep 17 00:00:00 2001
From: Noel Power <noel.power@novell.com>
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.
---
 test/prj/d.lst                                     |  5 +++
 .../user/data/registrymodifications.xcu            | 37 ++++++++++++++++++++++
 test/user-template/user/registrymodifications.xcu  | 37 ----------------------
 3 files changed, 42 insertions(+), 37 deletions(-)
 create mode 100644 test/user-template/user/data/registrymodifications.xcu
 delete mode 100644 test/user-template/user/registrymodifications.xcu

(limited to 'test')

diff --git a/test/prj/d.lst b/test/prj/d.lst
index 9211e33b9131..9ec65baa9c7b 100644
--- a/test/prj/d.lst
+++ b/test/prj/d.lst
@@ -6,3 +6,8 @@ mkdir: %_DEST%\inc\test
 ..\%__SRC%\lib\libtest.dll.a %_DEST%\lib\libtest.dll.a
 ..\inc\test\testdllapi.hxx %_DEST%\inc\test\testdllapi.hxx
 ..\inc\test\bootstrapfixture.hxx %_DEST%\inc\test\bootstrapfixture.hxx
+mkdir: %_DEST%\unittest
+mkdir: %_DEST%\unittest\user
+mkdir: %_DEST%\unittest\user\data
+..\user-template\user\data\registrymodifications.xcu %_DEST%\unittest\user\data\registrymodifications.xcu
+
diff --git a/test/user-template/user/data/registrymodifications.xcu b/test/user-template/user/data/registrymodifications.xcu
new file mode 100644
index 000000000000..cdfda4a723a3
--- /dev/null
+++ b/test/user-template/user/data/registrymodifications.xcu
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * [ Copyright (C) 2011 Stephan Bergmann <sbergman@redhat.com> (initial
+ *   developer) ]
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+-->
+<oor:items xmlns:oor="http://openoffice.org/2001/registry">
+ <item oor:path="/org.openoffice.Office.Paths/Paths">
+  <node oor:name="UIConfig" oor:op="replace">
+   <node oor:name="InternalPaths">
+    <node oor:name="$(userurl)/config" oor:op="fuse"/>
+   </node>
+  </node>
+ </item>
+</oor:items>
diff --git a/test/user-template/user/registrymodifications.xcu b/test/user-template/user/registrymodifications.xcu
deleted file mode 100644
index cdfda4a723a3..000000000000
--- a/test/user-template/user/registrymodifications.xcu
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * [ Copyright (C) 2011 Stephan Bergmann <sbergman@redhat.com> (initial
- *   developer) ]
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
--->
-<oor:items xmlns:oor="http://openoffice.org/2001/registry">
- <item oor:path="/org.openoffice.Office.Paths/Paths">
-  <node oor:name="UIConfig" oor:op="replace">
-   <node oor:name="InternalPaths">
-    <node oor:name="$(userurl)/config" oor:op="fuse"/>
-   </node>
-  </node>
- </item>
-</oor:items>
-- 
cgit v1.2.3