diff options
Diffstat (limited to 'unotest/source/cpp/bootstrapfixturebase.cxx')
| -rw-r--r-- | unotest/source/cpp/bootstrapfixturebase.cxx | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx b/unotest/source/cpp/bootstrapfixturebase.cxx index 9c7863280092..90b3c1fb1e01 100644 --- a/unotest/source/cpp/bootstrapfixturebase.cxx +++ b/unotest/source/cpp/bootstrapfixturebase.cxx @@ -50,21 +50,36 @@ test::BootstrapFixtureBase::BootstrapFixtureBase() CPPUNIT_ASSERT_MESSAGE("SRC_ROOT env variable not set", pSrcRoot != NULL && pSrcRoot[0] != 0); const char* pSolverRoot = getenv( "OUTDIR_FOR_BUILD" ); CPPUNIT_ASSERT_MESSAGE("$OUTDIR_FOR_BUILD env variable not set", pSolverRoot != NULL && pSolverRoot[0] != 0); + const char* pWorkdirRoot = getenv( "WORKDIR_FOR_BUILD" ); + CPPUNIT_ASSERT_MESSAGE("$WORKDIR_FOR_BUILD env variable not set", pWorkdirRoot != NULL && pWorkdirRoot[0] != 0); #ifdef WNT if (pSrcRoot[1] == ':') + { m_aSrcRootURL += rtl::OUString::createFromAscii( "/" ); + } if (pSolverRoot[1] == ':') + { m_aSolverRootURL += rtl::OUString::createFromAscii( "/" ); + } + if (pWorkdirRoot[1] == ':') + { + m_aWorkdirRootURL += rtl::OUString::createFromAscii( "/" ); + } #endif #else const char* pSrcRoot = "/assets"; const char* pSolverRoot = "/assets"; + const char* pWorkdirRoot = "/assets"; #endif m_aSrcRootPath = rtl::OUString::createFromAscii( pSrcRoot ); m_aSrcRootURL += m_aSrcRootPath; m_aSolverRootPath = rtl::OUString::createFromAscii( pSolverRoot ); m_aSolverRootURL += m_aSolverRootPath; + + m_aWorkdirRootPath = rtl::OUString::createFromAscii( pWorkdirRoot ); + m_aWorkdirRootURL += m_aWorkdirRootPath; + } test::BootstrapFixtureBase::~BootstrapFixtureBase() @@ -81,14 +96,16 @@ test::BootstrapFixtureBase::~BootstrapFixtureBase() return m_aSrcRootPath + rtl::OUString::createFromAscii( pPath ); } -::rtl::OUString test::BootstrapFixtureBase::getURLFromSolver( const char *pPath ) + +::rtl::OUString test::BootstrapFixtureBase::getURLFromWorkdir( const char *pPath ) { - return m_aSolverRootURL + rtl::OUString::createFromAscii( pPath ); + return m_aWorkdirRootURL + rtl::OUString::createFromAscii( pPath ); } -::rtl::OUString test::BootstrapFixtureBase::getPathFromSolver( const char *pPath ) +::rtl::OUString test::BootstrapFixtureBase::getPathFromWorkdir( const char *pPath ) { - return m_aSolverRootPath + rtl::OUString::createFromAscii( pPath ); + return m_aWorkdirRootPath + rtl::OUString::createFromAscii( pPath ); + } void test::BootstrapFixtureBase::setUp() |