From 1a9ff86402ff3140b5468154d983c5dcf9dc5696 Mon Sep 17 00:00:00 2001 From: Cameron Aavik Date: Fri, 8 Mar 2024 10:55:15 +1000 Subject: [PATCH] Attempt at fixing Mono AOT LLVM --- src/BenchmarkDotNet/Toolchains/Executor.cs | 2 +- .../Toolchains/MonoAotLLVM/MonoAotLLVMGenerator.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/BenchmarkDotNet/Toolchains/Executor.cs b/src/BenchmarkDotNet/Toolchains/Executor.cs index 735c6f7437..145e527439 100644 --- a/src/BenchmarkDotNet/Toolchains/Executor.cs +++ b/src/BenchmarkDotNet/Toolchains/Executor.cs @@ -146,7 +146,7 @@ private static ProcessStartInfo CreateStartInfo(BenchmarkCase benchmarkCase, Art case MonoAotLLVMRuntime _: start.FileName = exePath; start.Arguments = args; - start.WorkingDirectory = artifactsPaths.BinariesDirectoryPath; + start.WorkingDirectory = Path.Combine(artifactsPaths.BinariesDirectoryPath, "publish"); break; case CustomRuntime _: start.FileName = exePath; diff --git a/src/BenchmarkDotNet/Toolchains/MonoAotLLVM/MonoAotLLVMGenerator.cs b/src/BenchmarkDotNet/Toolchains/MonoAotLLVM/MonoAotLLVMGenerator.cs index cd64739ba9..833c113d84 100644 --- a/src/BenchmarkDotNet/Toolchains/MonoAotLLVM/MonoAotLLVMGenerator.cs +++ b/src/BenchmarkDotNet/Toolchains/MonoAotLLVM/MonoAotLLVMGenerator.cs @@ -55,10 +55,10 @@ protected override void GenerateProject(BuildPartition buildPartition, Artifacts protected override string GetExecutablePath(string binariesDirectoryPath, string programName) => Portability.RuntimeInformation.IsWindows() - ? Path.Combine(binariesDirectoryPath, $"{programName}.exe") - : Path.Combine(binariesDirectoryPath, programName); + ? Path.Combine(binariesDirectoryPath, "publish", $"{programName}.exe") + : Path.Combine(binariesDirectoryPath, "publish", programName); protected override string GetBinariesDirectoryPath(string buildArtifactsDirectoryPath, string configuration) - => Path.Combine(buildArtifactsDirectoryPath, "bin", configuration, TargetFrameworkMoniker, CustomDotNetCliToolchainBuilder.GetPortableRuntimeIdentifier(), "publish"); + => Path.Combine(buildArtifactsDirectoryPath, "bin", configuration, TargetFrameworkMoniker, CustomDotNetCliToolchainBuilder.GetPortableRuntimeIdentifier()); } }