Log shows a wrong name for plot images dotnet#1181

dotnet#1181
marcnet80 · Sep 6, 2019 · ea2e818 · ea2e818
1 parent ee97ca1
commit ea2e818
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/src/BenchmarkDotNet/Exporters/RPlotExporter.cs b/src/BenchmarkDotNet/Exporters/RPlotExporter.cs
@@ -16,6 +16,7 @@ public class RPlotExporter : IExporter, IExporterDependencies
         public static readonly IExporter Default = new RPlotExporter();
         public string Name => nameof(RPlotExporter);
 
+        private const string ImageExtension = ".png";
         private static readonly object BuildScriptLock = new object();
 
         public IEnumerable<IExporter> Dependencies
@@ -30,9 +31,7 @@ public IEnumerable<string> ExportToFiles(Summary summary, ILogger consoleLogger)
             const string logFileName = "BuildPlots.log";
             yield return scriptFileName;
 
-            string fileNamePrefix = Path.Combine(summary.ResultsDirectoryPath, summary.Title);
             string csvFullPath = CsvMeasurementsExporter.Default.GetArtifactFullName(summary);
-
             string scriptFullPath = Path.Combine(summary.ResultsDirectoryPath, scriptFileName);
             string logFullPath = Path.Combine(summary.ResultsDirectoryPath, logFileName);
             string script = ResourceHelper.
@@ -65,8 +64,7 @@ public IEnumerable<string> ExportToFiles(Summary summary, ILogger consoleLogger)
                 process?.WaitForExit();
             }
 
-            yield return fileNamePrefix + "-boxplot.png";
-            yield return fileNamePrefix + "-barplot.png";
+            yield return $"*{ImageExtension}";
         }
 
         public void ExportToLog(Summary summary, ILogger logger)
@@ -125,4 +123,4 @@ private static string FindInPath(string fileName)
             return null;
         }
     }
-}
+}
diff --git a/src/BenchmarkDotNet/Extensions/StringAndTextExtensions.cs b/src/BenchmarkDotNet/Extensions/StringAndTextExtensions.cs
@@ -84,5 +84,13 @@ internal static string HtmlEncode(this string s)
             }
             return sb.ToString();
         }
+
+        /// <summary>
+        /// Returns file base name
+        /// </summary>
+        internal static string GetBaseName(this string path, string directory)
+        {
+            return path.Replace(directory, string.Empty).Trim('/', '\\');
+        }
     }
 }
diff --git a/src/BenchmarkDotNet/Running/BenchmarkRunnerClean.cs b/src/BenchmarkDotNet/Running/BenchmarkRunnerClean.cs
@@ -28,7 +28,7 @@ namespace BenchmarkDotNet.Running
     internal static class BenchmarkRunnerClean
     {
         internal const string DateTimeFormat = "yyyyMMdd-HHmmss";
-
+        
         internal static readonly IResolver DefaultResolver = new CompositeResolver(EnvironmentResolver.Instance, InfrastructureResolver.Instance);
 
         internal static Summary[] Run(BenchmarkRunInfo[] benchmarkRunInfos)
@@ -196,7 +196,7 @@ private static void PrintSummary(ILogger logger, ImmutableConfig config, Summary
             string currentDirectory = Directory.GetCurrentDirectory();
             foreach (string file in config.GetCompositeExporter().ExportToFiles(summary, logger))
             {
-                logger.WriteLineInfo($"  {file.Replace(currentDirectory, string.Empty).Trim('/', '\\')}");
+                logger.WriteLineInfo($"  {file.GetBaseName(currentDirectory)}");
             }
 
             logger.WriteLine();