From 8ae26327574458dc915825c0e1a4038671b6c782 Mon Sep 17 00:00:00 2001 From: dawe Date: Tue, 13 Feb 2024 17:24:13 +0100 Subject: [PATCH 1/4] fix configuration case --- tests/benchmarks/SmokeTestBenchmarks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/benchmarks/SmokeTestBenchmarks.sh b/tests/benchmarks/SmokeTestBenchmarks.sh index 0da2c8f2213..75fcd54ec7f 100755 --- a/tests/benchmarks/SmokeTestBenchmarks.sh +++ b/tests/benchmarks/SmokeTestBenchmarks.sh @@ -6,7 +6,7 @@ run() { local path=$1 dotnet run \ --project $path \ - -c release \ + -c Release \ --no-build \ --job Dry \ --allCategories short \ From 5a7f4a4999d380d36f5dcddc50d168734e01c28d Mon Sep 17 00:00:00 2001 From: dawe Date: Tue, 13 Feb 2024 17:24:36 +0100 Subject: [PATCH 2/4] make path construction x-platform --- .../CompilerServiceBenchmarks/CompilerServiceBenchmarks.fs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/CompilerServiceBenchmarks.fs b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/CompilerServiceBenchmarks.fs index 2b28cdce001..cc25ecb2cc6 100644 --- a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/CompilerServiceBenchmarks.fs +++ b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/CompilerServiceBenchmarks.fs @@ -105,7 +105,8 @@ type CompilerServiceBenchmarks() = | Some _ -> configOpt | None -> let checker = FSharpChecker.Create(projectCacheSize = 200) - let source = FSharpSourceText.From(File.OpenRead("""..\..\..\..\..\..\..\..\..\src\Compiler\Checking\CheckExpressions.fs"""), Encoding.Default, FSharpSourceHashAlgorithm.Sha1, true) + let path = Path.Combine("..", "..", "..", "..", "..", "..", "..", "..", "..", "src", "Compiler", "Checking", "CheckExpressions.fs") + let source = FSharpSourceText.From(File.OpenRead(path), Encoding.Default, FSharpSourceHashAlgorithm.Sha1, true) let assemblies = AppDomain.CurrentDomain.GetAssemblies() |> Array.map (fun x -> x.Location) From f0eccb0e362f01d3ae2cf6edae3485123b0dc3f3 Mon Sep 17 00:00:00 2001 From: dawe Date: Tue, 13 Feb 2024 17:25:14 +0100 Subject: [PATCH 3/4] to be consistent --- tests/benchmarks/SmokeTestBenchmarks.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/benchmarks/SmokeTestBenchmarks.ps1 b/tests/benchmarks/SmokeTestBenchmarks.ps1 index 710d8c3e2ba..4d5cda02c7c 100644 --- a/tests/benchmarks/SmokeTestBenchmarks.ps1 +++ b/tests/benchmarks/SmokeTestBenchmarks.ps1 @@ -9,7 +9,7 @@ function Run { dotnet run ` --project $path ` - -c release ` + -c Release ` --no-build ` --job Dry ` --allCategories short ` From 2962127cc0afb588b2f53e4e0e89297e6925d516 Mon Sep 17 00:00:00 2001 From: dawe Date: Tue, 13 Feb 2024 18:34:40 +0100 Subject: [PATCH 4/4] improve path construction --- .../CompilerServiceBenchmarks/CompilerServiceBenchmarks.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/CompilerServiceBenchmarks.fs b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/CompilerServiceBenchmarks.fs index cc25ecb2cc6..44a0f9fdaaf 100644 --- a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/CompilerServiceBenchmarks.fs +++ b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/CompilerServiceBenchmarks.fs @@ -105,7 +105,7 @@ type CompilerServiceBenchmarks() = | Some _ -> configOpt | None -> let checker = FSharpChecker.Create(projectCacheSize = 200) - let path = Path.Combine("..", "..", "..", "..", "..", "..", "..", "..", "..", "src", "Compiler", "Checking", "CheckExpressions.fs") + let path = __SOURCE_DIRECTORY__ ++ ".." ++ ".." ++ ".." ++ ".." ++ "src" ++ "Compiler" ++ "Checking" ++ "CheckExpressions.fs" let source = FSharpSourceText.From(File.OpenRead(path), Encoding.Default, FSharpSourceHashAlgorithm.Sha1, true) let assemblies = AppDomain.CurrentDomain.GetAssemblies()