diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-07 09:51:59 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-07 11:18:30 +0100 |
| commit | 8bf24518fcd6fab000edf193e0591b9bf0b9c152 (patch) | |
| tree | b089b5700e4f66d031d00653e51bf306ac335b96 /sal | |
| parent | 28fb1e99223d2ea934f7f7f85226238b6365d024 (diff) | |
Revert "Fix osl_Security::getHomeDir test under fakeroot"
This reverts commit c8098382da6a7a0448ff8051cac467f91d7e0b36.
Conflicts:
sal/qa/osl/security/osl_Security.cxx
There should be no good reason to run unit tests like
CppunitTest_sal_osl_security under fakeroot, esp. not since
a58e086ededb8442938e81f971dfae36ef7eb076 "rework the default make target" no
longer runs them as part of a plain `make`. (And getting rid of this code means
one less place to audit for nullptr issues with getenv in combination with
potential OString -> std::string_view changes.)
Change-Id: I6bba0ed28ea1ba894ee182f8bda35aad69a54dc6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107336
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/qa/osl/security/osl_Security.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx index b5e46ee3eccd..b0b741d6cfe0 100644 --- a/sal/qa/osl/security/osl_Security.cxx +++ b/sal/qa/osl/security/osl_Security.cxx @@ -346,11 +346,8 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *, strUserName = OUString::createFromAscii( pw->pw_name ); /// get home directory; - char *pw_dir = pw->pw_dir; - if( getenv( "FAKEROOTKEY" ) ) - pw_dir = getenv("HOME"); CPPUNIT_ASSERT_EQUAL_MESSAGE( "#Convert from system path to URL failed.", - ::osl::File::E_None, ::osl::File::getFileURLFromSystemPath( OUString::createFromAscii( pw_dir ), strHomeDirectory ) ); + ::osl::File::E_None, ::osl::File::getFileURLFromSystemPath( OUString::createFromAscii( pw->pw_dir ), strHomeDirectory ) ); /// get config directory; strConfigDirectory = strHomeDirectory.copy(0); |