Merge branch 'master' into af/memory-diagnostics

4 years ago · 5489343725
1 changed files with 4 additions and 1 deletions
--- a/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.cs
+++ b/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.cs
@ -245,7 +245,10 @@ namespace SixLabors.ImageSharp.Tests.Memory.Allocators
            cleanup.Register(b1);
        }

-        [Theory]
+        public static readonly bool IsNotMacOS = !TestEnvironment.IsOSX;
+
+        // TODO: Investigate MacOS failures
+        [ConditionalTheory(nameof(IsNotMacOS))]
        [InlineData(false)]
        [InlineData(true)]
        public void RentReturnRelease_SubsequentRentReturnsDifferentHandles(bool multiple)