align both Executors to use the same timeout (2s) (#1848)

Author: adamsitnik

src/BenchmarkDotNet/Toolchains/DotNetCli/DotNetCliExecutor.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Diagnostics;
 using System.IO;
-using System.Threading;
 using BenchmarkDotNet.Characteristics;
 using BenchmarkDotNet.Diagnosers;
 using BenchmarkDotNet.Engines;
@@ -22,7 +21,6 @@ public class DotNetCliExecutor : IExecutor
         public DotNetCliExecutor(string customDotNetCliPath) => CustomDotNetCliPath = customDotNetCliPath;
 
         private string CustomDotNetCliPath { get; }
-        private static readonly TimeSpan ProcessExitTimeout = TimeSpan.FromSeconds(2);
 
         public ExecuteResult Execute(ExecuteParameters executeParameters)
         {
@@ -90,14 +88,14 @@ private ExecuteResult Execute(BenchmarkCase benchmarkCase,
 
                 loggerWithDiagnoser.ProcessInput();
 
-                if (!process.WaitForExit(milliseconds: (int)ProcessExitTimeout.TotalMilliseconds))
+                if (!process.WaitForExit(milliseconds: (int)ExecuteParameters.ProcessExitTimeout.TotalMilliseconds))
                 {
-                    logger.WriteLineInfo($"// The benchmarking process did not quit within {ProcessExitTimeout.TotalSeconds} seconds, it's going to get force killed now.");
+                    logger.WriteLineInfo($"// The benchmarking process did not quit within {ExecuteParameters.ProcessExitTimeout.TotalSeconds} seconds, it's going to get force killed now.");
 
                     consoleExitHandler.KillProcessTree();
                 }
 
-                return new ExecuteResult(true, process.HasExited ? (int?)process.ExitCode : null, process.Id, loggerWithDiagnoser.LinesWithResults, loggerWithDiagnoser.LinesWithExtraOutput);
+                return new ExecuteResult(true, process.HasExited ? process.ExitCode : null, process.Id, loggerWithDiagnoser.LinesWithResults, loggerWithDiagnoser.LinesWithExtraOutput);
             }
         }
     }

src/BenchmarkDotNet/Toolchains/Executor.cs

@@ -11,7 +11,6 @@
 using BenchmarkDotNet.Helpers;
 using BenchmarkDotNet.Jobs;
 using BenchmarkDotNet.Loggers;
-using BenchmarkDotNet.Portability;
 using BenchmarkDotNet.Running;
 using BenchmarkDotNet.Toolchains.Parameters;
 using BenchmarkDotNet.Toolchains.Results;
@@ -69,7 +68,7 @@ private ExecuteResult Execute(Process process, BenchmarkCase benchmarkCase, Sync
 
             loggerWithDiagnoser.ProcessInput();
 
-            if (!process.WaitForExit(milliseconds: 250))
+            if (!process.WaitForExit(milliseconds: (int)ExecuteParameters.ProcessExitTimeout.TotalMilliseconds))
             {
                 logger.WriteLineInfo("// The benchmarking process did not quit on time, it's going to get force killed now.");
 

src/BenchmarkDotNet/Toolchains/Parameters/ExecuteParameters.cs

@@ -3,11 +3,14 @@
 using BenchmarkDotNet.Loggers;
 using BenchmarkDotNet.Running;
 using BenchmarkDotNet.Toolchains.Results;
+using System;
 
 namespace BenchmarkDotNet.Toolchains.Parameters
 {
     public class ExecuteParameters
     {
+        internal static readonly TimeSpan ProcessExitTimeout = TimeSpan.FromSeconds(2);
+
         public ExecuteParameters(BuildResult buildResult, BenchmarkCase benchmarkCase, BenchmarkId benchmarkId, ILogger logger, IResolver resolver, IDiagnoser diagnoser = null)
         {
             BuildResult = buildResult;