handle UnauthorizedAccessException from mmap on OSX (dotnet#35619)

* handle UnauthorizedAccessException on OSX * update SkipTestException text * add comments Co-authored-by: Tomas Weinfurt <[email protected]>
garora · Apr 30, 2020 · ac544ff · ac544ff
1 parent 3735efb
commit ac544ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewAccessor.Tests.cs b/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewAccessor.Tests.cs
@@ -91,9 +91,11 @@ public void ValidAccessLevelCombinations(MemoryMappedFileAccess mapAccess, Memor
                 }
                 catch (UnauthorizedAccessException)
                 {
-                    if (PlatformDetection.IsInContainer && (viewAccess == MemoryMappedFileAccess.ReadExecute || viewAccess == MemoryMappedFileAccess.ReadWriteExecute))
+                    if ((RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || PlatformDetection.IsInContainer) &&
+                       (viewAccess == MemoryMappedFileAccess.ReadExecute || viewAccess == MemoryMappedFileAccess.ReadWriteExecute))
                     {
-                        throw new SkipTestException("Execute permission failing in container.");
+                        // Containers and OSX with SIP enabled do not have execute permissions by default.
+                        throw new SkipTestException("Insufficient execute permission.");
                     }
 
                     throw;

diff --git a/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStream.Tests.cs b/src/libraries/System.IO.MemoryMappedFiles/tests/MemoryMappedViewStream.Tests.cs
@@ -91,9 +91,11 @@ public void ValidAccessLevelCombinations(MemoryMappedFileAccess mapAccess, Memor
                 }
                 catch (UnauthorizedAccessException)
                 {
-                    if (PlatformDetection.IsInContainer && (viewAccess == MemoryMappedFileAccess.ReadExecute || viewAccess == MemoryMappedFileAccess.ReadWriteExecute))
+                    if ((RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || PlatformDetection.IsInContainer) &&
+                        (viewAccess == MemoryMappedFileAccess.ReadExecute || viewAccess == MemoryMappedFileAccess.ReadWriteExecute))
                     {
-                        throw new SkipTestException("Execute permission failing in container.");
+                        // Containers and OSX with SIP enabled do not have execute permissions by default.
+                        throw new SkipTestException("Insufficient execute permission.");
                     }
 
                     throw;