diff --git a/src/cijobs/cijobs.cs b/src/cijobs/cijobs.cs index fdda7851..772fd7ea 100755 --- a/src/cijobs/cijobs.cs +++ b/src/cijobs/cijobs.cs @@ -332,7 +332,7 @@ private static int Main(string[] args) } // Wrap CI httpClient with focused APIs for product, job, and build. - // This logic is seperate from listing/copying and just extracts data. + // This logic is separate from listing/copying and just extracts data. private class CIClient { private HttpClient _client; diff --git a/src/jit-analyze/jit-analyze.cs b/src/jit-analyze/jit-analyze.cs index 97b96415..ca6cd596 100644 --- a/src/jit-analyze/jit-analyze.cs +++ b/src/jit-analyze/jit-analyze.cs @@ -955,7 +955,7 @@ class ScriptResolverPolicyWrapper : ICommandResolverPolicy // There are files with diffs. Build up a dictionary mapping base file name to net text diff count. // Use "git diff" to do the analysis for us, then parse that output. // - // "git diff --no-index --exit-code --numstat" output shows added/deleted lines: + // "git diff --no-index --diff-filter=M --exit-code --numstat" output shows added/deleted lines: // // => // diff --git a/src/jit-dasm-pmi/jit-dasm-pmi.cs b/src/jit-dasm-pmi/jit-dasm-pmi.cs index 4cce9853..e93e26ab 100644 --- a/src/jit-dasm-pmi/jit-dasm-pmi.cs +++ b/src/jit-dasm-pmi/jit-dasm-pmi.cs @@ -573,9 +573,13 @@ void AppendEnvironmentVariableToPmiEnv(string varName, string varValue) // Generate path to the output file var assemblyFileName = Path.ChangeExtension(assembly.Name, ".dasm"); var dasmPath = Path.Combine(_rootPath, assembly.OutputPath, assemblyFileName); - var logPath = Path.ChangeExtension(dasmPath, ".log"); + + // Create logs in separate folder so they don't get picked up by "git diff" + var logPath = Path.Combine(Path.GetDirectoryName(dasmPath) + "logs", assemblyFileName); + logPath = Path.ChangeExtension(logPath, ".log"); PathUtility.EnsureParentDirectoryExists(dasmPath); + PathUtility.EnsureParentDirectoryExists(logPath); AppendEnvironmentVariableToPmiEnv("COMPlus_JitStdOutFile", dasmPath); diff --git a/src/jit-dasm/jit-dasm.cs b/src/jit-dasm/jit-dasm.cs index 83c5b705..bbf23f91 100644 --- a/src/jit-dasm/jit-dasm.cs +++ b/src/jit-dasm/jit-dasm.cs @@ -10,7 +10,7 @@ // tools to validate ongoing development. // // Scenario 1: Pass A and B compilers to jitdasm. Using the --base and --diff -// arguments pass two seperate compilers and a passed set of assemblies. This +// arguments pass two separate compilers and a passed set of assemblies. This // is the most common scenario. // // Scenario 2: Iterativly call jitdasm with a series of compilers tagging @@ -512,13 +512,19 @@ public void GenerateAsm() } string dasmPath = null; + string logPath = null; if (_rootPath != null) { // Generate path to the output file var assemblyFileName = Path.ChangeExtension(assembly.Name, ".dasm"); dasmPath = Path.Combine(_rootPath, assembly.OutputPath, assemblyFileName); + // Create logs in separate folder so they don't get picked up by "git diff" + logPath = Path.Combine(Path.GetDirectoryName(dasmPath) + "logs", assemblyFileName); + logPath = Path.ChangeExtension(logPath, ".log"); + PathUtility.EnsureParentDirectoryExists(dasmPath); + PathUtility.EnsureParentDirectoryExists(logPath); AddEnvironmentVariable("COMPlus_JitStdOutFile", dasmPath); } @@ -544,8 +550,6 @@ public void GenerateAsm() if (_rootPath != null) { - var logPath = Path.ChangeExtension(dasmPath, ".log"); - // Redirect stdout/stderr to log file and run command. using (var outputStreamWriter = File.CreateText(logPath)) {