[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sal/qa

[Caolán McNamara (via logerrit)]

 sal/qa/osl/file/osl_File.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 88c8e2ae2b92f806b4add25bba06e702dcb38eb5
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Feb 8 20:30:20 2021 +0000
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Tue Feb 9 11:03:16 2021 +0100

    report what value was found in message
    
    Change-Id: I512cedcd46f829b97b62a57d90d5a4a81d024d66
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110598
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 42c7a18a4f11..544fd6c4d629 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -254,7 +254,6 @@ static void createTestDirectory(const OUString& basename, const OUString& dirnam
 static void deleteTestDirectory(const OUString& dirname)
 {
     OUString aPathURL = dirname.copy(0);
-    osl::FileBase::RC nError;
     if (!isURL(dirname))
         osl::FileBase::getFileURLFromSystemPath(dirname, aPathURL); // convert if not full qualified URL
 
@@ -262,10 +261,10 @@ static void deleteTestDirectory(const OUString& dirname)
     if (testDir.isOpen())
         testDir.close();  // close if still open.
 
-    nError = Directory::remove(aPathURL);
+    osl::FileBase::RC nError = Directory::remove(aPathURL);
 
     OString strError = "In deleteTestDirectory function: remove Directory " +
-        OUStringToOString(aPathURL, RTL_TEXTENCODING_ASCII_US);
+        OUStringToOString(aPathURL, RTL_TEXTENCODING_ASCII_US) + " -> result: " + OString::number(nError);
     CPPUNIT_ASSERT_MESSAGE(strError.getStr(), (osl::FileBase::E_None == nError) || (nError == osl::FileBase::E_NOENT));
 }