Allow multiple [SkipOnCoreClr] #7960
Merged
Conversation
This file contains hidden or 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
Member
Author
|
cc @safern, @AaronRobinsonMSFT, please take a look. I have not removed |
safern
reviewed
Sep 24, 2021
| private static readonly Lazy<bool> s_isGCStress3 = new Lazy<bool>(() => CompareGCStressModeAsLower(GetEnvironmentVariableValue("COMPlus_GCStress"), "0x3", "3") || | ||
| CompareGCStressModeAsLower(GetEnvironmentVariableValue("DOTNET_GCStress"), "0x3", "3")); | ||
| private static readonly Lazy<bool> s_isGCStressC = new Lazy<bool>(() => CompareGCStressModeAsLower(GetEnvironmentVariableValue("COMPlus_GCStress"), "0xC", "C") || | ||
| CompareGCStressModeAsLower(GetEnvironmentVariableValue("DOTNET_GCStress"), "0xC", "C")); |
Member
There was a problem hiding this comment.
Maybe we could make GetEnvironmentVariableValue get the feature name and then that method could consider both prefixes and if any is set return that value? If we do that maybe consider renaming GetEnvironmentVariableValue to something like GetFeatureEnvironmentVariableValue.
Member
Author
There was a problem hiding this comment.
It looks much cleaner that way. :)
safern
approved these changes
Sep 24, 2021
Member
safern
left a comment
safern
left a comment
There was a problem hiding this comment.
Other than one idea, looks great! Thanks 😄
am11
force-pushed
the
feature/skiponcoreclr
branch
from
e831917 to
4d8b3bb
Compare
AaronRobinsonMSFT
approved these changes
Sep 24, 2021
Member
|
Thanks @am11 -- I'll let you know whenever this is consumed in dotnet/runtime. |
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Currently, we can specify multiple conditions with
[SkipOnCoreClr]that get checked withANDsemantics. To achieveORsemantics, we need to specify it multiple times (just like[ActiveIssue]), which is currently not possible. For context, see dotnet/runtime#59564 (comment).In second commit, I have added
DOTNET_variables for eachCOMPlus_one. This is because CoreCLR (despite still supportsCOMPlus_) now considersCOMPlus_as legacy convention and prefersDOTNET_. See https://github.com/dotnet/runtime/blob/b0159122f3570decd8ced6228681a210e2711de6/src/coreclr/inc/clrconfignocache.h#L77