Skip to content

Fix/baseline baseservices pri 1 tests #102551

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
merged 1 commit into from
May 22, 2024
Merged

Fix/baseline baseservices pri 1 tests #102551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/tests/baseservices/compilerservices/modulector/runmoduleconstructor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ public class RuntimeHelperTest
[Fact]
public static void TestEntryPoint()
{
const string asmName = "moduleCctor";
AssemblyLoadContext resolver0 = AssemblyLoadContext.GetLoadContext(Assembly.GetExecutingAssembly());
Assembly asm0 = resolver0.LoadFromAssemblyName(new AssemblyName("moduleCctor"));
Assembly asm0 = resolver0.LoadFromAssemblyName(new AssemblyName(asmName));
Module mod = asm0.ManifestModule;

RuntimeHelpers.RunModuleConstructor(mod.ModuleHandle);
var oType = asm0.GetType("IntHolder",true);
var oType = Type.GetType("IntHolder, " + asmName,true);
MethodInfo check = oType.GetMethod("Check");
MethodInfo assign = oType.GetMethod("Assign");

Expand Down
2 changes: 2 additions & 0 deletions src/tests/baseservices/exceptions/regressions/Dev11/154243/dynamicmethodliveness.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<RequiresProcessIsolation>true</RequiresProcessIsolation>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<CLRTestPriority>1</CLRTestPriority>
<!-- Test uses Reflection.Emit -->
<NativeAotIncompatible>true</NativeAotIncompatible>
</PropertyGroup>
<ItemGroup>
<Compile Include="dynamicmethodliveness.cs" />
Expand Down
8 changes: 8 additions & 0 deletions src/tests/baseservices/exceptions/sharedexceptions/emptystacktrace/oomexception01.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,19 @@ public void CreateAndThrow()
{
oomStack = oomStack.Substring(0, oomStack.IndexOf(':') - 1);
}
if (oomStack.IndexOf("+ 0x") != -1)
{
oomStack = oomStack.Substring(0, oomStack.IndexOf("+ 0x") - 1);
}

if (expectedStack.IndexOf(':') != -1)
{
expectedStack = expectedStack.Substring(0, expectedStack.IndexOf(':') - 1);
}
if (expectedStack.IndexOf("+ 0x") != -1)
{
expectedStack = expectedStack.Substring(0, expectedStack.IndexOf("+ 0x") - 1);
}

if (oomStack != expectedStack)
{
Expand Down
2 changes: 2 additions & 0 deletions src/tests/baseservices/exceptions/simple/ParallelCrashTester.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<RequiresProcessIsolation>true</RequiresProcessIsolation>
<!-- Temporarily disabled due to https://github.com/dotnet/runtime/issues/80356 -->
<GCStressIncompatible>true</GCStressIncompatible>
<!-- Test expects corerun -->
<NativeAotIncompatible>true</NativeAotIncompatible>
</PropertyGroup>
<ItemGroup>
<Compile Include="ParallelCrashTester.cs" />
Expand Down
9 changes: 9 additions & 0 deletions src/tests/baseservices/threading/threadpool/bindhandle/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />

<PropertyGroup>
<!-- ThreadPool.BindHandle doesn't work with the Windows threadpool: https://github.com/dotnet/runtimelab/issues/491 -->
<UseWindowsThreadPool>false</UseWindowsThreadPool>
</PropertyGroup>
</Project>
3 changes: 3 additions & 0 deletions src/tests/issues.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,9 @@

<!-- NativeAOT specific -->
<ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TestBuildMode)' == 'nativeaot' and '$(RuntimeFlavor)' == 'coreclr'">
<ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/regressions/beta2/437017/**">
<Issue>https://github.com/dotnet/runtime/issues/102544</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/JIT/Regression/JitBlue/devdiv_902271/DevDiv_902271/**">
<Issue>needs triage</Issue>
</ExcludeList>
Expand Down