Skip to content

Commit cc4b772

Browse files
authored
Fix the benchmark build (#16604)
* Fix the benchmark build * up * Update HistoricalBenchmark.Runner.fsproj * up * try something out
1 parent b3a7e29 commit cc4b772

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

azure-pipelines.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -718,10 +718,8 @@ stages:
718718
steps:
719719
- checkout: self
720720
clean: true
721-
- script: eng\CIBuild.cmd -testBenchmarks
721+
- script: eng\CIBuild.cmd -configuration $(_BuildConfig) -testBenchmarks
722722
displayName: Smoke test fast benchmarks
723-
continueOnError: true
724-
condition: always()
725723

726724
# Test trimming on Windows
727725
- job: Build_And_Test_Trimming_Windows

eng/Build.ps1

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ function TestUsingMSBuild([string] $testProject, [string] $targetFramework, [str
346346

347347
if ($env:RunningAsPullRequest -ne "true" -and $noTestFilter -eq $false) {
348348
$args += " --filter TestCategory!=PullRequest"
349-
}`
349+
}
350350

351351
if ($asBackgroundJob) {
352352
Write-Host("Starting on the background: $args")
@@ -549,11 +549,7 @@ try {
549549
}
550550

551551
if ($testBenchmarks) {
552-
$properties_storage = $properties
553-
$properties += "/p:RuntimeIdentifier=win-x64"
554-
$properties += "/p:Configuration=Release" # Always run in release.
555552
BuildSolution "FSharp.Benchmarks.sln" $False
556-
$properties = $properties_storage
557553
}
558554

559555
if ($pack) {

tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.Runner/HistoricalBenchmark.Runner.fsproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<TargetFramework>net8.0</TargetFramework>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<RootNamespace>HistoricalBenchmark.Utilities</RootNamespace>
7+
<NoWarn>$(NoWarn);NETSDK1206</NoWarn>
78
</PropertyGroup>
89

910
<ItemGroup>

tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/BackgroundCompilerBenchmarks.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ type TestProjectType =
225225
[<MemoryDiagnoser>]
226226
[<ThreadingDiagnoser>]
227227
[<SimpleJob(warmupCount=1,iterationCount=4)>]
228-
[<BenchmarkCategory(ShortCategory)>]
228+
[<BenchmarkCategory(LongCategory)>]
229229
type TransparentCompilerBenchmark() =
230230

231231
let size = 30

0 commit comments

Comments
 (0)