[debugger][mt] Unify multithreading switches (#97861)

* Use only one env var for debugger. * Improve bool value processing. * Nit: Keep original layout. * fix build
dotnet · Feb 2, 2024 · 2b07375 · 2b07375
1 parent 7f02aef
commit 2b07375
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs b/src/mono/browser/debugger/DebuggerTestSuite/DebuggerTestBase.cs
@@ -45,7 +45,7 @@ public static bool ReleaseRuntime
 #else
             => false;
 #endif
-        public static bool WasmMultiThreaded => EnvironmentVariables.WasmTestsUsingVariant == "multithreaded";
+        public static bool WasmMultiThreaded => EnvironmentVariables.WasmEnableThreads;
 
         public static bool WasmSingleThreaded => !WasmMultiThreaded;
 

diff --git a/src/mono/browser/debugger/DebuggerTestSuite/EnvironmentVariables.cs b/src/mono/browser/debugger/DebuggerTestSuite/EnvironmentVariables.cs
@@ -9,9 +9,20 @@ namespace DebuggerTests;
 
 internal static class EnvironmentVariables
 {
-    public static readonly string? DebuggerTestPath = Environment.GetEnvironmentVariable("DEBUGGER_TEST_PATH");
-    public static readonly string? TestLogPath      = Environment.GetEnvironmentVariable("TEST_LOG_PATH");
-    public static readonly bool    SkipCleanup      = Environment.GetEnvironmentVariable("SKIP_CLEANUP") == "1" ||
-                                                       Environment.GetEnvironmentVariable("SKIP_CLEANUP") == "true";
-    public static readonly string? WasmTestsUsingVariant = Environment.GetEnvironmentVariable("WASM_TESTS_USING_VARIANT");
+    public static readonly string? DebuggerTestPath  = Environment.GetEnvironmentVariable("DEBUGGER_TEST_PATH");
+    public static readonly string? TestLogPath       = Environment.GetEnvironmentVariable("TEST_LOG_PATH");
+    public static readonly bool    SkipCleanup       = GetEnvironmentVariableValue("SKIP_CLEANUP");
+    public static readonly bool    WasmEnableThreads = GetEnvironmentVariableValue("WasmEnableThreads");
+
+    private static bool GetEnvironmentVariableValue(string envVariable)
+    {
+        string? str = Environment.GetEnvironmentVariable(envVariable);
+        if (str is null)
+            return false;
+
+        if (str == "1" || str.ToLower() == "true")
+            return true;
+
+        return false;
+    }
 }
diff --git a/src/mono/browser/debugger/Wasm.Debugger.Tests/Wasm.Debugger.Tests.csproj b/src/mono/browser/debugger/Wasm.Debugger.Tests/Wasm.Debugger.Tests.csproj
@@ -70,7 +70,7 @@
       <_DotnetCommand Condition="'$(OS)' == 'Windows_NT'">dotnet.exe</_DotnetCommand>
 
       <RunScriptCommand>$(_DotnetCommand) test DebuggerTestSuite/DebuggerTestSuite.dll</RunScriptCommand>
-      <RunScriptCommand Condition="'$(WasmEnableThreads)' == 'true'">$(RunScriptCommand) /e:WASM_TESTS_USING_VARIANT=multithreaded</RunScriptCommand>
+      <RunScriptCommand>$(RunScriptCommand) /e:WasmEnableThreads=$(WasmEnableThreads)</RunScriptCommand>
       <RunScriptCommand>$(RunScriptCommand) &quot;-l:trx%3BLogFileName=testResults.trx&quot;</RunScriptCommand>
       <RunScriptCommand Condition="'$(ContinuousIntegrationBuild)' == 'true'">$(RunScriptCommand) &quot;-l:console%3BVerbosity=normal&quot;</RunScriptCommand>
 

diff --git a/src/mono/wasm/threads.md b/src/mono/wasm/threads.md
@@ -80,7 +80,7 @@ a worker thread will use `async_run_in_main_thread` to queue up work for the mai
 
 To run the debugger tests in the runtime [built with enabled support for multi-threading](#building-the-runtime) we use:
 ```
-dotnet test src/mono/wasm/debugger/DebuggerTestSuite -e RuntimeConfiguration=Debug -e Configuration=Debug -e DebuggerHost=chrome -e WasmEnableThreads=true -e WASM_TESTS_USING_VARIANT=multithreaded
+dotnet test src/mono/wasm/debugger/DebuggerTestSuite -e RuntimeConfiguration=Debug -e Configuration=Debug -e DebuggerHost=chrome -e WasmEnableThreads=true
 ```
 
 ## JS interop on dedicated threads ##