use tools.ps1 helpers to get procdump

Thomas-Shephard · Feb 2, 2022 · 93298f6 · 93298f6
1 parent 3393ecf
commit 93298f6
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -26,23 +26,19 @@ jobs:
   pool:
     name: NetCore1ESPool-Public
     demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open
-  timeoutInMinutes: 40
+  timeoutInMinutes: 120
 
   steps:
     - checkout: self
       clean: true
-    - task: PowerShell@2
-      displayName: Download procdump
-      enabled: true
-      inputs:
-        targetType: inline
-        script: |
-          mkdir $env:Agent_TempDirectory\procdump
-          Invoke-WebRequest -Uri https://download.sysinternals.com/files/Procdump.zip -UseBasicParsing -OutFile $env:Agent_TempDirectory\procdump\Procdump.zip | Out-Null
-          Expand-Archive -Path $env:Agent_TempDirectory\procdump\Procdump.zip $env:Agent_TempDirectory\procdump\
-          set PROCDUMP_PATH=$env:Agent_TempDirectory\procdump\
-          Write-Host ##vso[task.setvariable variable=PROCDUMP_PATH;]${env:Agent_TempDirectory}\procdump
-          Write-Host ##vso[task.setvariable variable=PATH;]${env:Agent_TempDirectory}\procdump;${env:PATH};
+    - pwsh: eng\scripts\Get-ProcDump.ps1
+      displayName: Get ProcDump
+    - pwsh: Write-Host "##vso[task.setvariable variable=PROCDUMP_PATH;]$(Build.SourcesDirectory)\.tools\procdump"
+      displayName: Set PROCDUMP_PATH Environment Variable
+    - pwsh: Write-Host "##vso[task.prependpath]$(Build.SourcesDirectory)\.tools\procdump"
+      displayName: Set PATH Environment Variable
+    - pwsh: Write-Host "##vso[task.setvariable variable=VSTEST_DUMP_FORCEPROCDUMP;]1"
+      displayName: Set VSTEST_DUMP_FORCEPROCDUMP Environment Variable
     - script: eng\common\cibuild.cmd -configuration $(_configuration) -prepareMachine /p:Coverage=$(_codeCoverage)
       displayName: Build and Test
     - task: PublishTestResults@2
@@ -66,7 +62,7 @@ jobs:
       displayName: 'Publish Artifact: TestResults'
       inputs:
         PathtoPublish: '$(Build.SourcesDirectory)\artifacts\TestResults\$(_configuration)'
-        ArtifactName: 'FullOnWindows $(_configuration) Test Logs'
+        ArtifactName: 'Windows $(_configuration) Test Logs'
       continueOnError: true
       condition: always()
 

diff --git a/eng/Testing.props b/eng/Testing.props
@@ -4,6 +4,5 @@
     <TestRunnerAdditionalArguments>$(TestRunnerAdditionalArguments) --blame-hang-dump-type full</TestRunnerAdditionalArguments>
     <TestRunnerAdditionalArguments>$(TestRunnerAdditionalArguments) --blame-hang-timeout 10min</TestRunnerAdditionalArguments>
     <TestRunnerAdditionalArguments>$(TestRunnerAdditionalArguments) --blame-crash-dump-type full</TestRunnerAdditionalArguments>
-    <TestRunnerAdditionalArguments>$(TestRunnerAdditionalArguments) --blame-crash-collect-always</TestRunnerAdditionalArguments>
   </PropertyGroup>
 </Project>
diff --git a/eng/scripts/Get-ProcDump.ps1 b/eng/scripts/Get-ProcDump.ps1
@@ -0,0 +1,13 @@
+<#
+.SYNOPSIS
+Downloads 32-bit and 64-bit procdump executables and returns the path to where they were installed.
+eng\scripts\Get-ProcDump.ps1
+#>
+. $PSScriptRoot/../common/tools.ps1
+$procDumpDir = Join-Path $ToolsDir "procdump"
+$procDumpToolPath = Join-Path $procDumpDir "procdump.exe"
+if (-not (Test-Path $procDumpToolPath)) {
+    Invoke-WebRequest -Uri https://download.sysinternals.com/files/Procdump.zip -UseBasicParsing -OutFile $TempDir\Procdump.zip | Out-Null
+    Expand-Archive -Path $TempDir\Procdump.zip $procDumpDir
+}
+(Resolve-Path $procDumpDir).Path