Architecture test improvement (microsoft#3254)

Architecture test improvement
Evangelink · Jan 15, 2022 · cecf20c · cecf20c
1 parent d40a6c4
commit cecf20c
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/DotnetArchitectureSwitchTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/DotnetArchitectureSwitchTests.cs
@@ -143,12 +143,12 @@ public void DOTNET_ROOTS_EnvironmentVariables(bool dotnetRoot, bool dotnetRootX6
             }
 
             // Verify switch using csproj
-            ExecuteApplication($"{privateX64Installation}/dotnet", $"test {projectPath} --framework net6.0 --arch x64", out stdOut, out stdError, out exitCode, env, projectDirectory);
+            ExecuteApplication($"{privateX64Installation}/{GetMuxerName}", $"test {projectPath} --framework net6.0 --arch x64", out stdOut, out stdError, out exitCode, env, projectDirectory);
             AssertSwitch(stdOut);
 
             // Verify switch using test container
             var buildAssemblyPath = GetAssetFullPath("ArchitectureSwitch.dll", "net6.0");
-            ExecuteApplication($"{privateX64Installation}/dotnet", $"test {buildAssemblyPath} --framework net6.0 --arch x64", out stdOut, out stdError, out exitCode, env, projectDirectory);
+            ExecuteApplication($"{privateX64Installation}/{GetMuxerName}", $"test {buildAssemblyPath} --framework net6.0 --arch x64", out stdOut, out stdError, out exitCode, env, projectDirectory);
             AssertSwitch(stdOut);
 
             void AssertSwitch(string output)
@@ -185,12 +185,12 @@ public void PrivateX64BuildToGlobalArmInstallation()
             Assert.IsTrue(stdOut.Contains("ProcessArchitecture: X64"), "Unexpected ProcessArchitecture");
 
             // Verify switch using csproj
-            ExecuteApplication($"{privateX64Installation}/dotnet", $"test {projectPath} --framework net6.0 --arch arm64", out stdOut, out stdError, out exitCode, env, projectDirectory);
+            ExecuteApplication($"{privateX64Installation}/{GetMuxerName}", $"test {projectPath} --framework net6.0 --arch arm64", out stdOut, out stdError, out exitCode, env, projectDirectory);
             AssertSwitch(stdOut);
 
             // Verify switch using test container
             var buildAssemblyPath = GetAssetFullPath("ArchitectureSwitch.dll", "net6.0");
-            ExecuteApplication($"{privateX64Installation}/dotnet", $"test {buildAssemblyPath} --framework net6.0 --arch arm64", out stdOut, out stdError, out exitCode, env, projectDirectory);
+            ExecuteApplication($"{privateX64Installation}/{GetMuxerName}", $"test {buildAssemblyPath} --framework net6.0 --arch arm64", out stdOut, out stdError, out exitCode, env, projectDirectory);
             AssertSwitch(stdOut);
 
             void AssertSwitch(string output)
@@ -240,12 +240,12 @@ public void PrivateX64BuildToDOTNET_ROOTS_EnvironmentVariables(bool dotnetRoot,
             }
 
             // Verify switch using csproj
-            ExecuteApplication($"{privateX64Installation}/dotnet", $"test {projectPath} --framework net6.0 --arch arm64", out stdOut, out stdError, out exitCode, env, projectDirectory);
+            ExecuteApplication($"{privateX64Installation}/{GetMuxerName}", $"test {projectPath} --framework net6.0 --arch arm64", out stdOut, out stdError, out exitCode, env, projectDirectory);
             AssertSwitch(stdOut);
 
             // Verify switch using test container
             var buildAssemblyPath = GetAssetFullPath("ArchitectureSwitch.dll", "net6.0");
-            ExecuteApplication($"{privateX64Installation}/dotnet", $"test {buildAssemblyPath} --framework net6.0 --arch arm64", out stdOut, out stdError, out exitCode, env, projectDirectory);
+            ExecuteApplication($"{privateX64Installation}/{GetMuxerName}", $"test {buildAssemblyPath} --framework net6.0 --arch arm64", out stdOut, out stdError, out exitCode, env, projectDirectory);
             AssertSwitch(stdOut);
 
             void AssertSwitch(string output)