Added NodeJS Engine (#665)

* Added NodeJS engine * only use exe on windows and if node
dotnet · Jun 30, 2021 · 6d17e5b · 6d17e5b
1 parent 567bf8f
commit 6d17e5b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...Microsoft.DotNet.XHarness.CLI/CommandArguments/WASM/Arguments/JavaScriptEngineArgument.cs b/...Microsoft.DotNet.XHarness.CLI/CommandArguments/WASM/Arguments/JavaScriptEngineArgument.cs
@@ -42,5 +42,9 @@ internal enum JavaScriptEngine
         /// SpiderMonkey
         /// </summary>
         SpiderMonkey,
+        /// <summary>
+        /// NodeJS
+        /// </summary>
+        NodeJS,
     }
 }
diff --git a/src/Microsoft.DotNet.XHarness.CLI/Commands/WASM/JS/WasmTestCommand.cs b/src/Microsoft.DotNet.XHarness.CLI/Commands/WASM/JS/WasmTestCommand.cs
@@ -58,11 +58,17 @@ protected override async Task<ExitCode> InvokeInternal(ILogger logger)
                 JavaScriptEngine.V8 => "v8",
                 JavaScriptEngine.JavaScriptCore => "jsc",
                 JavaScriptEngine.SpiderMonkey => "sm",
+                JavaScriptEngine.NodeJS => "node",
                 _ => throw new ArgumentException("Engine not set")
             };
 
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                engineBinary = FindEngineInPath(engineBinary + ".cmd");
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
+                if (engineBinary.Equals("node"))
+                    engineBinary = FindEngineInPath(engineBinary + ".exe"); // NodeJS ships as .exe rather than .cmd
+
+                else
+                    engineBinary = FindEngineInPath(engineBinary + ".cmd");
+            }
 
             var webServerCts = new CancellationTokenSource();
             try