From 2dc09c96372eea64c80b2793bc445c4fc7b5a1d4 Mon Sep 17 00:00:00 2001 From: Anton Firszov Date: Sun, 5 Aug 2018 21:18:18 +0200 Subject: [PATCH] skip WrapSystemDrawingBitmap_* on most environments to avoid sporadic test failures --- .../Image/ImageTests.WrapMemory.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/ImageSharp.Tests/Image/ImageTests.WrapMemory.cs b/tests/ImageSharp.Tests/Image/ImageTests.WrapMemory.cs index 815684d84f..69572425c9 100644 --- a/tests/ImageSharp.Tests/Image/ImageTests.WrapMemory.cs +++ b/tests/ImageSharp.Tests/Image/ImageTests.WrapMemory.cs @@ -8,6 +8,7 @@ using System.Drawing.Imaging; using System.Runtime.CompilerServices; using SixLabors.ImageSharp.Advanced; +using SixLabors.ImageSharp.Common.Helpers; using SixLabors.ImageSharp.MetaData; using SixLabors.ImageSharp.PixelFormats; using SixLabors.Shapes; @@ -102,6 +103,11 @@ namespace SixLabors.ImageSharp.Tests [Fact] public void WrapSystemDrawingBitmap_WhenObserved() { + if (ShouldSkipBitmapTest) + { + return; + } + using (var bmp = new Bitmap(51, 23)) { using (var memoryManager = new BitmapMemoryManager(bmp)) @@ -130,6 +136,11 @@ namespace SixLabors.ImageSharp.Tests [Fact] public void WrapSystemDrawingBitmap_WhenOwned() { + if (ShouldSkipBitmapTest) + { + return; + } + using (var bmp = new Bitmap(51, 23)) { var memoryManager = new BitmapMemoryManager(bmp); @@ -151,6 +162,9 @@ namespace SixLabors.ImageSharp.Tests bmp.Save(fn, ImageFormat.Bmp); } } + + private static bool ShouldSkipBitmapTest => + !TestEnvironment.Is64BitProcess || TestHelpers.ImageSharpBuiltAgainst != "netcoreapp2.1"; } } } \ No newline at end of file