gbuild: move unittest mock profile to WORKDIR

Change-Id: Idd6420a855fec8b44fce6c0694b491d5f1eec95e

5 files changed, 5 insertions, 10 deletions

diff --git a/include/unotest/bootstrapfixturebase.hxx b/include/unotest/bootstrapfixturebase.hxx
index 556204becc61..cd4cff497518 100644
--- a/include/unotest/bootstrapfixturebase.hxx
+++ b/include/unotest/bootstrapfixturebase.hxx
@@ -36,8 +36,6 @@ class OOO_DLLPUBLIC_UNOTEST BootstrapFixtureBase : public CppUnit::TestFixture
 protected:
   OUString m_aSrcRootURL;
   OUString m_aSrcRootPath;
-  OUString m_aSolverRootURL;
-  OUString m_aSolverRootPath;
   OUString m_aWorkdirRootURL;
   OUString m_aWorkdirRootPath;
 
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 87c5cec9bdf9..5fe8e9597154 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -293,10 +293,10 @@ $(call gb_CppunitTest_get_target,$(1)) : HEADLESS=
 
 endef
 
-# Use configuration in $(OUTDIR)/unittest/registry.
+# Use configuration in $(WORKDIR)/unittest/registry.
 define gb_CppunitTest_use_unittest_configuration
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,test_unittest)
-$(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(OUTDIR)/unittest/registry)
+$(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(WORKDIR)/unittest/registry)
 
 endef
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 704cf803ac0d..0025f30d87c4 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -31,7 +31,7 @@ gb_PackagePart_get_destinations = \
 	$(OUTDIR)/pck \
 	$(OUTDIR)/res \
 	$(OUTDIR)/share \
-	$(OUTDIR)/unittest \
+	$(WORKDIR)/unittest \
 
 gb_InstallScript_get_target = $(OUTDIR)/bin/$(1)$(gb_InstallScript_EXT)
 # kind of lame but with just 3 of these why bother with registration etc.
diff --git a/test/Package_unittest.mk b/test/Package_unittest.mk
index 8cead93f677a..a21388acaa20 100644
--- a/test/Package_unittest.mk
+++ b/test/Package_unittest.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,test_unittest,$(SRCDIR)/test/user-template))
 
-$(eval $(call gb_Package_set_outdir,test_unittest,$(OUTDIR)))
+$(eval $(call gb_Package_set_outdir,test_unittest,$(WORKDIR)))
 
 $(eval $(call gb_Package_add_file,test_unittest,unittest/registry/modifications.xcd,registry/modifications.xcd))
 $(eval $(call gb_Package_add_file,test_unittest,unittest/user/wordbook/sl.dic,user/wordbook/sl.dic))
diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx b/unotest/source/cpp/bootstrapfixturebase.cxx
index fff21d4d85b7..5b6f9d3871c6 100644
--- a/unotest/source/cpp/bootstrapfixturebase.cxx
+++ b/unotest/source/cpp/bootstrapfixturebase.cxx
@@ -57,9 +57,6 @@ test::BootstrapFixtureBase::BootstrapFixtureBase()
     m_aSrcRootPath = OUString::createFromAscii( pSrcRoot );
     m_aSrcRootURL = getFileURLFromSystemPath(m_aSrcRootPath);
 
-    m_aSolverRootPath = OUString::createFromAscii( pSolverRoot );
-    m_aSolverRootURL = getFileURLFromSystemPath(m_aSolverRootPath);
-
     m_aWorkdirRootPath = OUString::createFromAscii( pWorkdirRoot );
     m_aWorkdirRootURL = getFileURLFromSystemPath(m_aWorkdirRootPath);
 
@@ -94,7 +91,7 @@ void test::BootstrapFixtureBase::setUp()
 {
     // set UserInstallation to user profile dir in test/user-template
     rtl::Bootstrap aDefaultVars;
-    OUString sUserInstallURL = m_aSolverRootURL + OUString("/unittest");
+    OUString sUserInstallURL = m_aWorkdirRootURL + OUString("/unittest");
     aDefaultVars.set(OUString("UserInstallation"), sUserInstallURL);
 
     m_xContext = comphelper::getProcessComponentContext();