diff options
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/diagnose.c | 2 | ||||
| -rw-r--r-- | sal/qa/osl/security/osl_Security.cxx | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sal/osl/unx/diagnose.c b/sal/osl/unx/diagnose.c index 728f4f6e2..0f89ddd06 100644 --- a/sal/osl/unx/diagnose.c +++ b/sal/osl/unx/diagnose.c @@ -255,7 +255,7 @@ sal_Bool SAL_CALL osl_assertFailedLine ( /* output message buffer */ OSL_DIAGNOSE_OUTPUTMESSAGE(f, szMessage); - /* output backtrace */ + /* should we output backtrace? */ char const * envBacktrace = getenv( "SAL_DIAGNOSE_BACKTRACE" ); if( envBacktrace != NULL && *envBacktrace != '\0' ) osl_diagnose_backtrace_Impl(f); diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx index 8bbb21aa2..fd4c5b7a7 100644 --- a/sal/qa/osl/security/osl_Security.cxx +++ b/sal/qa/osl/security/osl_Security.cxx @@ -368,8 +368,11 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *, strUserName = ::rtl::OUString::createFromAscii( pw->pw_name ); /// get home directory; + char *pw_dir = pw->pw_dir; + if( getenv( "FAKEROOTKEY" ) ) + pw_dir = getenv("HOME"); CPPUNIT_ASSERT_MESSAGE( "#Convert from system path to URL failed.", - ::osl::File::E_None == ::osl::File::getFileURLFromSystemPath( ::rtl::OUString::createFromAscii( pw->pw_dir ), strHomeDirectory ) ); + ::osl::File::E_None == ::osl::File::getFileURLFromSystemPath( ::rtl::OUString::createFromAscii( pw_dir ), strHomeDirectory ) ); /// get config directory; strConfigDirectory = strHomeDirectory.copy(0); |