Skip to content

Commit 2b1f6fe

Browse files
Remove .NET version constraints from allocator tests
1 parent bcf9add commit 2b1f6fe

File tree

2 files changed

+7
-15
lines changed

2 files changed

+7
-15
lines changed

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
// Licensed under the Six Labors Split License.
33

44
using System.Runtime.CompilerServices;
5-
#if NET7_0_OR_GREATER
65
using System.Runtime.InteropServices;
7-
#endif
86
using Microsoft.DotNet.RemoteExecutor;
97
using SixLabors.ImageSharp.Memory.Internals;
108

@@ -69,13 +67,11 @@ public void MultiplePoolInstances_TrimPeriodElapsed_AllAreTrimmed()
6967
return;
7068
}
7169

72-
#if NET7_0_OR_GREATER
73-
if (TestEnvironment.OSArchitecture == Architecture.Arm64)
74-
{
75-
// Skip on .NET7 ARM64: https://github.com/SixLabors/ImageSharp/issues/2342
76-
return;
77-
}
78-
#endif
70+
if (TestEnvironment.OSArchitecture == Architecture.Arm64)
71+
{
72+
// Skip on ARM64: https://github.com/SixLabors/ImageSharp/issues/2342
73+
return;
74+
}
7975

8076
RemoteExecutor.Invoke(RunTest).Dispose();
8177

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -261,13 +261,11 @@ public void AllocateMemoryGroup_Finalization_ReturnsToPool(int length)
261261
return;
262262
}
263263

264-
#if NET7_0_OR_GREATER
265264
if (TestEnvironment.OSArchitecture == Architecture.Arm64)
266265
{
267-
// Skip on .NET7 ARM64: https://github.com/SixLabors/ImageSharp/issues/2342
266+
// Skip on ARM64: https://github.com/SixLabors/ImageSharp/issues/2342
268267
return;
269268
}
270-
#endif
271269

272270
if (!TestEnvironment.RunsOnCI)
273271
{
@@ -331,13 +329,11 @@ public void AllocateSingleMemoryOwner_Finalization_ReturnsToPool(int length)
331329
return;
332330
}
333331

334-
#if NET7_0_OR_GREATER
335332
if (TestEnvironment.OSArchitecture == Architecture.Arm64)
336333
{
337-
// Skip on .NET7 ARM64: https://github.com/SixLabors/ImageSharp/issues/2342
334+
// Skip on ARM64: https://github.com/SixLabors/ImageSharp/issues/2342
338335
return;
339336
}
340-
#endif
341337

342338
if (!TestEnvironment.RunsOnCI)
343339
{

0 commit comments

Comments
 (0)