From 1746acdea5d42b2a63346f7144134289881063e7 Mon Sep 17 00:00:00 2001 From: Michael Niksa Date: Tue, 23 Nov 2021 16:35:51 -0800 Subject: [PATCH] Adjust PgoManager format to better match a default pgosweep format --- .../WindowsTerminal_UIATests/Common/PgoManager.cs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/cascadia/WindowsTerminal_UIATests/Common/PgoManager.cs b/src/cascadia/WindowsTerminal_UIATests/Common/PgoManager.cs index 7c9017282..de3135be0 100644 --- a/src/cascadia/WindowsTerminal_UIATests/Common/PgoManager.cs +++ b/src/cascadia/WindowsTerminal_UIATests/Common/PgoManager.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Diagnostics; using System.IO; using System.Text; @@ -9,16 +9,25 @@ namespace WindowsTerminal.UIA.Tests.Common { public static class PgoManager { + private static string TrimExtension(string str) + { + if (str.EndsWith(".exe") || str.EndsWith(".dll")) + { + return str.Substring(0, str.Length - 4); + } + return str; + } + public static void PgoSweepIfInstrumented(TestContext context, string assemblyName) { -#if PGO_INSTRUMENT +#if true string pgcFileName = context.TestName; Log.Comment($"Running pgosweep on '{assemblyName}' for test: {pgcFileName}"); try { var startInfo = new ProcessStartInfo() { FileName = Path.GetFullPath(Path.Combine(context.TestDeploymentDir, "pgosweep.exe")), - Arguments = $"{assemblyName} {assemblyName}-{pgcFileName}.pgc", + Arguments = $"{assemblyName} {TrimExtension(assemblyName)}!{pgcFileName}.pgc", UseShellExecute = false, RedirectStandardOutput = true };