Merge pull request #6777 from KevinH-MS/EETestFailFast

Always "fail fast" in EE unit tests...

Author: KevinH-MS

src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/ExpressionCompilerTestBase.cs

@@ -28,6 +28,12 @@ public abstract class ExpressionCompilerTestBase : CSharpTestBase, IDisposable
 
         internal static readonly ImmutableArray<Alias> NoAliases = ImmutableArray<Alias>.Empty;
 
+        protected ExpressionCompilerTestBase()
+        {
+            // We never want to swallow Exceptions (generate a non-fatal Watson) when running tests.
+            ExpressionEvaluatorFatalError.IsFailFastEnabled = true;
+        }
+
         public override void Dispose()
         {
             base.Dispose();

src/ExpressionEvaluator/Core/Source/ExpressionCompiler/ExpressionEvaluatorFatalError.cs

@@ -16,7 +16,7 @@ internal static class ExpressionEvaluatorFatalError
     {
         private const string RegistryKey = @"Software\Microsoft\ExpressionEvaluator";
         private const string RegistryValue = "EnableFailFast";
-        private static readonly bool s_isFailFastEnabled;
+        internal static bool IsFailFastEnabled;
 
         static ExpressionEvaluatorFatalError()
         {
@@ -41,7 +41,7 @@ static ExpressionEvaluatorFatalError()
                                     var value = getValueMethod.Invoke(eeKey, new object[] { RegistryValue });
                                     if ((value != null) && (value is int))
                                     {
-                                        s_isFailFastEnabled = ((int)value == 1);
+                                        IsFailFastEnabled = ((int)value == 1);
                                     }
                                 }
                             }
@@ -57,7 +57,7 @@ static ExpressionEvaluatorFatalError()
 
         internal static bool CrashIfFailFastEnabled(Exception exception)
         {
-            if (!s_isFailFastEnabled)
+            if (!IsFailFastEnabled)
             {
                 return false;
             }

src/ExpressionEvaluator/Core/Source/ExpressionCompiler/FrameDecoder.cs

@@ -104,7 +104,7 @@ private void GetNameWithGenericTypeArguments(
                             }
                             onSuccess(method);
                         }
-                        catch (Exception e) when (ExpressionEvaluatorFatalError.ReportNonFatalException(e, DkmComponentManager.ReportCurrentNonFatalException))
+                        catch (Exception e)
                         {
                             onFailure(e);
                         }
@@ -173,7 +173,7 @@ private void GetFrameName(
                             builder?.Free();
                             completionRoutine(new DkmGetFrameNameAsyncResult(frameName));
                         }
-                        catch (Exception e) when (ExpressionEvaluatorFatalError.ReportNonFatalException(e, DkmComponentManager.ReportCurrentNonFatalException))
+                        catch (Exception e)
                         {
                             completionRoutine(DkmGetFrameNameAsyncResult.CreateErrorResult(e));
                         }

src/ExpressionEvaluator/Core/Source/ResultProvider/ResultProvider.cs

@@ -637,7 +637,7 @@ private static void EvaluateDebuggerDisplayStringAndContinue(
                     {
                         onCompleted(result);
                     }
-                    catch (Exception e) when (ExpressionEvaluatorFatalError.ReportNonFatalException(e, DkmComponentManager.ReportCurrentNonFatalException))
+                    catch (Exception e)
                     {
                         onException(e);
                     }
@@ -901,7 +901,7 @@ internal void Execute()
                     {
                         completionRoutine();
                     }
-                    catch (Exception e) when (ExpressionEvaluatorFatalError.ReportNonFatalException(e, DkmComponentManager.ReportCurrentNonFatalException))
+                    catch (Exception e)
                     {
                         _onException(e);
                     }

src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestBase.cs

@@ -23,11 +23,14 @@ public abstract class ResultProviderTestBase
 
         internal readonly DkmInspectionContext DefaultInspectionContext;
 
-        internal ResultProviderTestBase(ResultProvider resultProvider, DkmInspectionContext defaultInspectionContext)
+        protected ResultProviderTestBase(ResultProvider resultProvider, DkmInspectionContext defaultInspectionContext)
         {
             _formatter = resultProvider.Formatter;
             _resultProvider = resultProvider;
             this.DefaultInspectionContext = defaultInspectionContext;
+
+            // We never want to swallow Exceptions (generate a non-fatal Watson) when running tests.
+            ExpressionEvaluatorFatalError.IsFailFastEnabled = true;
         }
 
         internal DkmClrValue CreateDkmClrValue(

src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/ExpressionCompilerTestBase.vb

@@ -29,6 +29,11 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests
 
         Friend Shared ReadOnly NoAliases As ImmutableArray(Of [Alias]) = ImmutableArray(Of [Alias]).Empty
 
+        Protected Sub New()
+            ' We never want to swallow Exceptions (generate a non-fatal Watson) when running tests.
+            ExpressionEvaluatorFatalError.IsFailFastEnabled = True
+        End Sub
+
         Public Overrides Sub Dispose()
             MyBase.Dispose()