Skip to content

[tests] Fix PlatformDetection.IsMonoInterpreter for mobile #59587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lambdageek merged 3 commits into from
Sep 25, 2021
Merged

[tests] Fix PlatformDetection.IsMonoInterpreter for mobile #59587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7077421
[tests] Correctly detect the Mono interpreter
lambdageek Sep 24, 2021
f267a8a
[tests] Run System.Threading.Tasks.Dataflow.Tests on Apple platforms
lambdageek Sep 24, 2021
c0fd8a3
Only check RuntimeFeature on netcoreapp. Otherwise return false
lambdageek Sep 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,13 +467,10 @@ private static bool GetTls13Support()
private static bool GetIsRunningOnMonoInterpreter()
{
#if NETCOREAPP
if (IsBrowser)
return RuntimeFeature.IsDynamicCodeSupported;
return IsMonoRuntime && RuntimeFeature.IsDynamicCodeSupported && !RuntimeFeature.IsDynamicCodeCompiled;
#else
return false;
#endif
// This is a temporary solution because mono does not support interpreter detection
// within the runtime.
var val = Environment.GetEnvironmentVariable("MONO_ENV_OPTIONS");
return (val != null && val.Contains("--interpreter"));

@am11 am11 Sep 24, 2021 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we also remove it from eng/pipelines/coreclr/templates/run-performance-job.yml and src/tests/Common/testenvironment.proj?

@lambdageek lambdageek Sep 24, 2021

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so. We still need to set it when we're running on desktop platforms using Mono, since in that case we're just using the normal libraries test host.

The issue is just that it's not sufficient to check for the environment variable setting to detect whether we're using the interpreter. The RuntimeFeature checks should be accurate on all configurations, AFAIK.

}

private static bool GetIsBrowserDomSupported()
Expand Down
1 change: 0 additions & 1 deletion src/libraries/tests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@
<ProjectExclusions Include="$(RepoRoot)/src/tests/FunctionalTests/tvOS/Simulator/AOT/tvOS.Simulator.Aot.Test.csproj" />
<!-- Crashes randomly during test runs https://github.com/dotnet/runtime/issues/52460 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Threading.Tasks\tests\System.Threading.Tasks.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Threading.Tasks.Dataflow\tests\System.Threading.Tasks.Dataflow.Tests.csproj" />

<!-- Crash https://github.com/dotnet/runtime/issues/56085 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj" />
Expand Down