From 1d81d5ab39b1b7df241c976d3a3bdadaf1c90ee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Mon, 13 Jul 2020 14:53:10 +0200 Subject: [PATCH] Use testhost.exe only on Windows x86 and x64, and enable hang dumps on ARM and ARM64 (#2479) --- .../Hosting/DotnetTestHostManager.cs | 2 +- src/vstest.console/Processors/EnableBlameArgumentProcessor.cs | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs index 514a030ab9..9794f2fe7a 100644 --- a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs +++ b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs @@ -230,7 +230,7 @@ public virtual TestProcessStartInfo GetTestHostProcessStartInfo( // If testhost.exe is available use it, unless user specified path to dotnet.exe, then we will use the testhost.dll bool testHostExeFound = false; - if (!useCustomDotnetHostpath && this.platformEnvironment.OperatingSystem.Equals(PlatformOperatingSystem.Windows)) + if (!useCustomDotnetHostpath && this.platformEnvironment.OperatingSystem.Equals(PlatformOperatingSystem.Windows) && (this.platformEnvironment.Architecture == PlatformArchitecture.X64 || this.platformEnvironment.Architecture == PlatformArchitecture.X86)) { var exeName = this.architecture == Architecture.X86 ? "testhost.x86.exe" : "testhost.exe"; var fullExePath = Path.Combine(sourceDirectory, exeName); diff --git a/src/vstest.console/Processors/EnableBlameArgumentProcessor.cs b/src/vstest.console/Processors/EnableBlameArgumentProcessor.cs index fbb4c458bb..18fcf80ce3 100644 --- a/src/vstest.console/Processors/EnableBlameArgumentProcessor.cs +++ b/src/vstest.console/Processors/EnableBlameArgumentProcessor.cs @@ -330,9 +330,7 @@ private bool IsDumpCollectionSupported() private bool IsHangDumpCollectionSupported() { var dumpCollectionSupported = - this.environment.OperatingSystem != PlatformOperatingSystem.OSX - && this.environment.Architecture != PlatformArchitecture.ARM64 - && this.environment.Architecture != PlatformArchitecture.ARM; + this.environment.OperatingSystem != PlatformOperatingSystem.OSX; if (!dumpCollectionSupported) {