Also use a static constructor in the TestRuntime.

dlemstra · Sep 12, 2024 · 6a99e4f · 6a99e4f
1 parent d936238
commit 6a99e4f
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/tests/Magick.NET.Tests/TestHelpers/TestRuntime.cs b/tests/Magick.NET.Tests/TestHelpers/TestRuntime.cs
@@ -8,13 +8,18 @@ namespace Magick.NET.Tests;
 
 internal static class TestRuntime
 {
-    public static bool HasFlakyLinuxArm64Result { get; } = IsLinux && Runtime.Architecture is Architecture.Arm64;
+    static TestRuntime()
+    {
+        HasFlakyLinuxArm64Result = RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && Runtime.Architecture is Architecture.Arm64;
+        HasFlakyMacOSResult = RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
+        HasFlakyMacOSArm64Result = HasFlakyMacOSResult && Runtime.Architecture == Architecture.Arm64;
+    }
 
-    public static bool HasFlakyMacOSResult { get; } = IsMacOS;
+    public static bool HasFlakyLinuxArm64Result { get; }
 
-    public static bool HasFlakyMacOSArm64Result { get; } = IsMacOS && Runtime.Architecture is Architecture.Arm64;
+    public static bool HasFlakyMacOSResult { get; }
 
-    private static bool IsLinux { get; } = RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
+    public static bool HasFlakyMacOSArm64Result { get; }
 
-    private static bool IsMacOS { get; } = RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
+    private static bool IsMacOS { get; }
 }