[Libreoffice-commits] core.git: sal/qa

[Christian Lohmaier (via logerrit)]

 sal/qa/osl/file/osl_File.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5e124e9d9d3bf3a55fe9956561db229d079288cc
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Thu Feb 4 22:56:52 2021 +0100
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Fri Feb 5 12:40:27 2021 +0100

    osl_File checks: creation in root can also fail because of read-only filesystem
    
    80b7949016fbc6addd54bf9f6cf300c756fd0f8a enabled a bunch of previously
    disabled checks, but on m1 macs osl_File::open::open_004 fails the
    assert, because it doesn't fail with E_ACCES, but with E_ROFS.
    (probably nothing to do with apple silicon, but rather because of Big
    Sur and using apfs as filesystem)
    
    Change-Id: Ibd2168ba5fb9d859ea339713099c9bc8a799fcc7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110431
    Tested-by: Jenkins
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index d0b50f6dfedb..a9f7183f673e 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -2224,7 +2224,7 @@ namespace osl_File
             File testFile(aTestFile);
 
             auto nError1 = testFile.open(osl_File_OpenFlag_Create);
-            bool bOK = (nError1 == File::E_ACCES);
+            bool bOK = (nError1 == File::E_ACCES || nError1 == File::E_ROFS);
 #ifdef _WIN32
             bOK = true;  /// in Windows, you can create file in c:\ any way.
             testFile.close();