Refactor out the CoreCLR configuration detection so we can re-use it …

…in dotnet/runtime without having to copy it. (#8176) * Refactor out the CoreCLR configuration detection so we can re-use it in dotnet/runtime without having to copy it. * Update src/Microsoft.DotNet.XUnitExtensions/src/Discoverers/SkipOnCoreClrDiscoverer.cs
dotnet · Nov 13, 2021 · 16988fc · 16988fc
1 parent fd5a907
commit 16988fc
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 46 deletions.
diff --git a/src/Microsoft.DotNet.XUnitExtensions/src/CoreClrConfigurationDetection.cs b/src/Microsoft.DotNet.XUnitExtensions/src/CoreClrConfigurationDetection.cs
@@ -0,0 +1,58 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+//
+
+using System;
+using System.Globalization;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Security;
+using System.Text;
+
+namespace Xunit
+{
+    public static class CoreClrConfigurationDetection
+    {
+        public static bool IsJitStress => !string.Equals(GetEnvironmentVariableValue("JitStress"), "0", StringComparison.InvariantCulture);
+        public static bool IsJitStressRegs => !string.Equals(GetEnvironmentVariableValue("JitStressRegs"), "0", StringComparison.InvariantCulture);
+        public static bool IsJitMinOpts => string.Equals(GetEnvironmentVariableValue("JITMinOpts"), "1", StringComparison.InvariantCulture);
+        public static bool IsTailCallStress => string.Equals(GetEnvironmentVariableValue("TailcallStress"), "1", StringComparison.InvariantCulture);
+        public static bool IsZapDisable => string.Equals(GetEnvironmentVariableValue("ZapDisable"), "1", StringComparison.InvariantCulture);
+        public static bool IsGCStress3 => CompareGCStressModeAsLower(GetEnvironmentVariableValue("GCStress"), "0x3", "3");
+        public static bool IsGCStressC => CompareGCStressModeAsLower(GetEnvironmentVariableValue("GCStress"), "0xC", "C");
+
+        public static bool IsGCStress => GetEnvironmentVariableValue("GCStress") != string.Empty;
+
+        public static bool IsCheckedRuntime => AssemblyConfigurationEquals("Checked");
+        public static bool IsReleaseRuntime => AssemblyConfigurationEquals("Release");
+        public static bool IsDebugRuntime => AssemblyConfigurationEquals("Debug");
+
+        public static bool IsStressTest =>
+            IsGCStress ||
+            IsZapDisable ||
+            IsTailCallStress ||
+            IsJitStressRegs ||
+            IsJitStress ||
+            IsJitMinOpts;
+
+        private static string GetEnvironmentVariableValue(string name) =>
+            Environment.GetEnvironmentVariable("DOTNET_" + name) ?? Environment.GetEnvironmentVariable("COMPlus_" + name) ?? "0";
+
+        private static bool AssemblyConfigurationEquals(string configuration)
+        {
+            AssemblyConfigurationAttribute assemblyConfigurationAttribute = typeof(string).Assembly.GetCustomAttribute<AssemblyConfigurationAttribute>();
+
+            return assemblyConfigurationAttribute != null &&
+                string.Equals(assemblyConfigurationAttribute.Configuration, configuration, StringComparison.InvariantCulture);
+        }
+
+        private static bool CompareGCStressModeAsLower(string value, string first, string second)
+        {
+            value = value.ToLowerInvariant();
+            return string.Equals(value, first.ToLowerInvariant(), StringComparison.InvariantCulture) ||
+                string.Equals(value, second.ToLowerInvariant(), StringComparison.InvariantCulture) ||
+                string.Equals(value, "0xf", StringComparison.InvariantCulture) ||
+                string.Equals(value, "f", StringComparison.InvariantCulture);
+        }
+    }
+}
diff --git a/src/Microsoft.DotNet.XUnitExtensions/src/Discoverers/SkipOnCoreClrDiscoverer.cs b/src/Microsoft.DotNet.XUnitExtensions/src/Discoverers/SkipOnCoreClrDiscoverer.cs
@@ -13,16 +13,17 @@ namespace Microsoft.DotNet.XUnitExtensions
 {
     public class SkipOnCoreClrDiscoverer : ITraitDiscoverer
     {
-        private static readonly Lazy<bool> s_isJitStress = new Lazy<bool>(() => !string.Equals(GetEnvironmentVariableValue("JitStress"), "0", StringComparison.InvariantCulture));
-        private static readonly Lazy<bool> s_isJitStressRegs = new Lazy<bool>(() => !string.Equals(GetEnvironmentVariableValue("JitStressRegs"), "0", StringComparison.InvariantCulture));
-        private static readonly Lazy<bool> s_isJitMinOpts = new Lazy<bool>(() => string.Equals(GetEnvironmentVariableValue("JITMinOpts"), "1", StringComparison.InvariantCulture));
-        private static readonly Lazy<bool> s_isTailCallStress = new Lazy<bool>(() => string.Equals(GetEnvironmentVariableValue("TailcallStress"), "1", StringComparison.InvariantCulture));
-        private static readonly Lazy<bool> s_isZapDisable = new Lazy<bool>(() => string.Equals(GetEnvironmentVariableValue("ZapDisable"), "1", StringComparison.InvariantCulture));
-        private static readonly Lazy<bool> s_isGCStress3 = new Lazy<bool>(() => CompareGCStressModeAsLower(GetEnvironmentVariableValue("GCStress"), "0x3", "3"));
-        private static readonly Lazy<bool> s_isGCStressC = new Lazy<bool>(() => CompareGCStressModeAsLower(GetEnvironmentVariableValue("GCStress"), "0xC", "C"));
-        private static readonly Lazy<bool> s_isCheckedRuntime = new Lazy<bool>(() => IsCheckedRuntime());
-        private static readonly Lazy<bool> s_isReleaseRuntime = new Lazy<bool>(() => IsReleaseRuntime());
-        private static readonly Lazy<bool> s_isDebugRuntime = new Lazy<bool>(() => IsDebugRuntime());
+        private static readonly Lazy<bool> s_isJitStress = new Lazy<bool>(() => CoreClrConfigurationDetection.IsJitStress);
+        private static readonly Lazy<bool> s_isJitStressRegs = new Lazy<bool>(() => CoreClrConfigurationDetection.IsJitStressRegs);
+        private static readonly Lazy<bool> s_isJitMinOpts = new Lazy<bool>(() => CoreClrConfigurationDetection.IsJitMinOpts);
+        private static readonly Lazy<bool> s_isTailCallStress = new Lazy<bool>(() => CoreClrConfigurationDetection.IsTailCallStress);
+        private static readonly Lazy<bool> s_isZapDisable = new Lazy<bool>(() => CoreClrConfigurationDetection.IsZapDisable);
+        private static readonly Lazy<bool> s_isGCStress3 = new Lazy<bool>(() => CoreClrConfigurationDetection.IsGCStress3);
+        private static readonly Lazy<bool> s_isGCStressC = new Lazy<bool>(() => CoreClrConfigurationDetection.IsGCStressC);
+        private static readonly Lazy<bool> s_isCheckedRuntime = new Lazy<bool>(() => CoreClrConfigurationDetection.IsCheckedRuntime);
+        private static readonly Lazy<bool> s_isReleaseRuntime = new Lazy<bool>(() => CoreClrConfigurationDetection.IsReleaseRuntime);
+        private static readonly Lazy<bool> s_isDebugRuntime = new Lazy<bool>(() => CoreClrConfigurationDetection.IsDebugRuntime);
+        private static readonly Lazy<bool> s_isStressTest = new Lazy<bool>(() =>  CoreClrConfigurationDetection.IsStressTest);
 
         public IEnumerable<KeyValuePair<string, string>> GetTraits(IAttributeInfo traitAttribute)
         {
@@ -63,48 +64,13 @@ private static bool RuntimeConfigurationApplies(RuntimeConfiguration runtimeConf
 
         // Order here matters as some env variables may appear in multiple modes
         private static bool StressModeApplies(RuntimeTestModes stressMode) =>
-            (stressMode.HasFlag(RuntimeTestModes.RegularRun) && !IsStressTest) ||
+            (stressMode.HasFlag(RuntimeTestModes.RegularRun) && !s_isStressTest.Value) ||
             (stressMode.HasFlag(RuntimeTestModes.GCStress3) && s_isGCStress3.Value) ||
             (stressMode.HasFlag(RuntimeTestModes.GCStressC) && s_isGCStressC.Value) ||
             (stressMode.HasFlag(RuntimeTestModes.ZapDisable) && s_isZapDisable.Value) ||
             (stressMode.HasFlag(RuntimeTestModes.TailcallStress) && s_isTailCallStress.Value) ||
             (stressMode.HasFlag(RuntimeTestModes.JitStressRegs) && s_isJitStressRegs.Value) ||
             (stressMode.HasFlag(RuntimeTestModes.JitStress) && s_isJitStress.Value) ||
             (stressMode.HasFlag(RuntimeTestModes.JitMinOpts) && s_isJitMinOpts.Value);
-
-        private static bool IsStressTest =>
-            s_isGCStress3.Value ||
-            s_isGCStressC.Value ||
-            s_isZapDisable.Value ||
-            s_isTailCallStress.Value ||
-            s_isJitStressRegs.Value ||
-            s_isJitStress.Value ||
-            s_isJitMinOpts.Value;
-
-        private static string GetEnvironmentVariableValue(string name) =>
-            Environment.GetEnvironmentVariable("DOTNET_" + name) ?? Environment.GetEnvironmentVariable("COMPlus_" + name) ?? "0";
-
-        private static bool IsCheckedRuntime() => AssemblyConfigurationEquals("Checked");
-
-        private static bool IsReleaseRuntime() => AssemblyConfigurationEquals("Release");
-
-        private static bool IsDebugRuntime() => AssemblyConfigurationEquals("Debug");
-
-        private static bool AssemblyConfigurationEquals(string configuration)
-        {
-            AssemblyConfigurationAttribute assemblyConfigurationAttribute = typeof(string).Assembly.GetCustomAttribute<AssemblyConfigurationAttribute>();
-
-            return assemblyConfigurationAttribute != null &&
-                string.Equals(assemblyConfigurationAttribute.Configuration, configuration, StringComparison.InvariantCulture);
-        }
-
-        private static bool CompareGCStressModeAsLower(string value, string first, string second)
-        {
-            value = value.ToLowerInvariant();
-            return string.Equals(value, first.ToLowerInvariant(), StringComparison.InvariantCulture) ||
-                string.Equals(value, second.ToLowerInvariant(), StringComparison.InvariantCulture) ||
-                string.Equals(value, "0xf", StringComparison.InvariantCulture) ||
-                string.Equals(value, "f", StringComparison.InvariantCulture);
-        }
     }
 }