From 9d94811aa71d22bf5ec2fe1c6264dfd56909a689 Mon Sep 17 00:00:00 2001 From: Kunal Pathak Date: Wed, 10 Mar 2021 09:48:41 -0800 Subject: Superpmi collection pipeline improvements (#49385) * Do not pass --use-zapdisable to dotnet But instead pass to individual CoreRun.exe that is launched during benchmark run. That way we do not slow down the launch of dotnet.exe process. * Fail superpmi collection pipeline if there was no valid .mch files were found to merge * Upload merged .mch files as zipped artifacts TODO: Upload the superpmi.log from all the partition runs * TEMP: New Jit guid - Add new JIT guid so we don't overwrite the existing .mch files - Disable all the runs except benchmarks * add trailing path sep * Upload superpmi.logs separately * Use PublishPipelineArtifacts instead of upload artifacts * properly pass zapdisable to CoreRun.exe * Revert "TEMP: New Jit guid" This reverts commit e89ef69625e4e57bb622fc35ff66d82f14b34285. * Remove CoreClrTestBuildHost from benchmark run * fix --envVars for benchmarks run * add missing space * temporary disable other runs * Revert "temporary disable other runs" This reverts commit 2926d1f582061eee6c7852046982ffb5107887b3. --- src/coreclr/ToolBox/superpmi/mcs/verbmerge.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/coreclr/ToolBox') diff --git a/src/coreclr/ToolBox/superpmi/mcs/verbmerge.cpp b/src/coreclr/ToolBox/superpmi/mcs/verbmerge.cpp index efd6a53a87a..c141c1864b0 100644 --- a/src/coreclr/ToolBox/superpmi/mcs/verbmerge.cpp +++ b/src/coreclr/ToolBox/superpmi/mcs/verbmerge.cpp @@ -575,6 +575,12 @@ CLEAN_UP: LogError("Failed to delete file after MCS /merge failed. GetLastError()=%u", GetLastError()); } } + else + { + // if no files found to merge, then there was some problem. + LogError("No files found to merge."); + result = (totalSize == 0) ? 1 : 0; + } delete[] nameOfOutputFileAsWchar; return result; -- cgit v1.2.3