diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:56 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:56 +0200 |
| commit | 84c83035918d1f495b638e874118611c41f7c04d (patch) | |
| tree | 46792c3f1e699b4ae5ca8dea8b74927e083c5266 | |
| parent | baf97f3cc9b8b7f90c2a1bf2fff53f4996b594d2 (diff) | |
| parent | 55110f462459ebee167571da6ea72c19376ad50f (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
sal/osl/unx/diagnose.c
| -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 8339a4ad7c7d..ae847b6d02e0 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 7b6c22882eb3..5c0dec245a92 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); |