Browse Source

Remove .NET version constraints from allocator tests

pull/2341/head
James Jackson-South 3 years ago
parent
commit
2b1f6feb0a
  1. 14
      tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.Trim.cs
  2. 8
      tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedPoolMemoryAllocatorTests.cs

14
tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.Trim.cs

@ -2,9 +2,7 @@
// Licensed under the Six Labors Split License.
using System.Runtime.CompilerServices;
#if NET7_0_OR_GREATER
using System.Runtime.InteropServices;
#endif
using Microsoft.DotNet.RemoteExecutor;
using SixLabors.ImageSharp.Memory.Internals;
@ -69,13 +67,11 @@ public partial class UniformUnmanagedMemoryPoolTests
return;
}
#if NET7_0_OR_GREATER
if (TestEnvironment.OSArchitecture == Architecture.Arm64)
{
// Skip on .NET7 ARM64: https://github.com/SixLabors/ImageSharp/issues/2342
return;
}
#endif
if (TestEnvironment.OSArchitecture == Architecture.Arm64)
{
// Skip on ARM64: https://github.com/SixLabors/ImageSharp/issues/2342
return;
}
RemoteExecutor.Invoke(RunTest).Dispose();

8
tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedPoolMemoryAllocatorTests.cs

@ -261,13 +261,11 @@ public class UniformUnmanagedPoolMemoryAllocatorTests
return;
}
#if NET7_0_OR_GREATER
if (TestEnvironment.OSArchitecture == Architecture.Arm64)
{
// Skip on .NET7 ARM64: https://github.com/SixLabors/ImageSharp/issues/2342
// Skip on ARM64: https://github.com/SixLabors/ImageSharp/issues/2342
return;
}
#endif
if (!TestEnvironment.RunsOnCI)
{
@ -331,13 +329,11 @@ public class UniformUnmanagedPoolMemoryAllocatorTests
return;
}
#if NET7_0_OR_GREATER
if (TestEnvironment.OSArchitecture == Architecture.Arm64)
{
// Skip on .NET7 ARM64: https://github.com/SixLabors/ImageSharp/issues/2342
// Skip on ARM64: https://github.com/SixLabors/ImageSharp/issues/2342
return;
}
#endif
if (!TestEnvironment.RunsOnCI)
{

Loading…
Cancel
Save