Fix builds when --keepFiles is specified #2423
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
timcassell
force-pushed
the
fix-builds-keepfiles
branch
from
180311f to
58663f7
Compare
timcassell
force-pushed
the
fix-builds-keepfiles
branch
from
58663f7 to
35da9f9
Compare
Always use same ProgramName regardless of --keepFiles. Include benchmark assembly name in ProgramName.
timcassell
force-pushed
the
fix-builds-keepfiles
branch
from
35da9f9 to
6906de3
Compare
adamsitnik
reviewed
Dec 12, 2024
| @@ -18,12 +19,20 @@ namespace BenchmarkDotNet.Running | |||
| { | |||
| public class BuildPartition | |||
| { | |||
| // We use an auto-increment global counter instead of Guid to guarantee uniqueness per benchmark run (Guid has a small chance to collide), | |||
There was a problem hiding this comment.
Is the reason behind the two bug reports a Guid collision?
There was a problem hiding this comment.
No, the Guid collision is a side issue. The issues are the program name itself (and thus the output folder based on that program name).
timcassell
force-pushed
the
fix-builds-keepfiles
branch
from
127e8f7 to
8b0bab2
Compare
adamsitnik
approved these changes
Dec 12, 2024
| public BuildPartition(BenchmarkBuildInfo[] benchmarks, IResolver resolver) | ||
| { | ||
| Resolver = resolver; | ||
| RepresentativeBenchmarkCase = benchmarks[0].BenchmarkCase; | ||
| Benchmarks = benchmarks; | ||
| ProgramName = benchmarks[0].Config.Options.IsSet(ConfigOptions.KeepBenchmarkFiles) ? RepresentativeBenchmarkCase.Job.FolderInfo : Guid.NewGuid().ToString(); | ||
| // Combine the benchmark's assembly name, folder info, and build partition id. | ||
| string benchmarkAssemblyName = RepresentativeBenchmarkCase.Descriptor.Type.Assembly.GetName().Name; |
There was a problem hiding this comment.
IIRC Assembly Name should not contain any characters that are invalid for folder names. 👍
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2411
Fixes #1067