diff options
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 3 | ||||
| -rw-r--r-- | unotest/source/cpp/bootstrapfixturebase.cxx | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index cc6a70d1b5e1..0bd2e95b4efb 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -72,6 +72,7 @@ gb_CppunitTest_RUNTIMEDEPS += \ $(call gb_Library_get_target,localedata_es) \ $(call gb_Library_get_target,localedata_euro) \ $(call gb_Library_get_target,localedata_others) \ + $(call gb_Package_get_target,test_unittest) \ define gb_CppunitTest__make_args $(HEADLESS) \ @@ -115,7 +116,7 @@ else $(if $(gb_CppunitTest_vcl_hide_windows),export VCL_HIDE_WINDOWS=1 && ) \ $(if $(gb_CppunitTest_vcl_show_windows),unset VCL_HIDE_WINDOWS && ) \ mkdir -p $(dir $@) && \ - rm -fr $@.user && mkdir $@.user && \ + rm -fr $@.user && cp -r $(WORKDIR)/unittest $@.user && \ $(if $(gb_CppunitTest__use_confpreinit), \ $(INSTDIR)/program/lokconf_init $(call gb_CppunitTest__make_args) &&) \ $(if $(gb_CppunitTest__interactive),, \ diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx b/unotest/source/cpp/bootstrapfixturebase.cxx index e14736bd066f..2685d6bd6e2a 100644 --- a/unotest/source/cpp/bootstrapfixturebase.cxx +++ b/unotest/source/cpp/bootstrapfixturebase.cxx @@ -30,10 +30,6 @@ test::BootstrapFixtureBase::~BootstrapFixtureBase() void test::BootstrapFixtureBase::setUp() { - // set UserInstallation to user profile dir in test/user-template - OUString sUserInstallURL = m_directories.getURLFromWorkdir("/unittest"); - rtl::Bootstrap::set("UserInstallation", sUserInstallURL); - m_xContext = comphelper::getProcessComponentContext(); m_xFactory = m_xContext->getServiceManager(); m_xSFactory.set(m_xFactory, uno::UNO_QUERY_THROW); |