From 60658e3b93a668f5c7d111121f63972755b689dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?=
 <MichalStrehovsky@users.noreply.github.com>
Date: Wed, 22 May 2024 11:31:07 +0200
Subject: [PATCH] Fix/baseline baseservices pri 1 tests

---
 .../compilerservices/modulector/runmoduleconstructor.cs  | 5 +++--
 .../Dev11/154243/dynamicmethodliveness.csproj            | 2 ++
 .../sharedexceptions/emptystacktrace/oomexception01.cs   | 8 ++++++++
 .../exceptions/simple/ParallelCrashTester.csproj         | 2 ++
 .../threadpool/bindhandle/Directory.Build.props          | 9 +++++++++
 src/tests/issues.targets                                 | 3 +++
 6 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 src/tests/baseservices/threading/threadpool/bindhandle/Directory.Build.props

diff --git a/src/tests/baseservices/compilerservices/modulector/runmoduleconstructor.cs b/src/tests/baseservices/compilerservices/modulector/runmoduleconstructor.cs
index c3aa0693424614..f13ba23fa55384 100644
--- a/src/tests/baseservices/compilerservices/modulector/runmoduleconstructor.cs
+++ b/src/tests/baseservices/compilerservices/modulector/runmoduleconstructor.cs
@@ -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");
 
diff --git a/src/tests/baseservices/exceptions/regressions/Dev11/154243/dynamicmethodliveness.csproj b/src/tests/baseservices/exceptions/regressions/Dev11/154243/dynamicmethodliveness.csproj
index c4643b642af363..8f92451cf4f8fc 100644
--- a/src/tests/baseservices/exceptions/regressions/Dev11/154243/dynamicmethodliveness.csproj
+++ b/src/tests/baseservices/exceptions/regressions/Dev11/154243/dynamicmethodliveness.csproj
@@ -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" />
diff --git a/src/tests/baseservices/exceptions/sharedexceptions/emptystacktrace/oomexception01.cs b/src/tests/baseservices/exceptions/sharedexceptions/emptystacktrace/oomexception01.cs
index 3c6305620c64dd..e72e4cdcc4a592 100644
--- a/src/tests/baseservices/exceptions/sharedexceptions/emptystacktrace/oomexception01.cs
+++ b/src/tests/baseservices/exceptions/sharedexceptions/emptystacktrace/oomexception01.cs
@@ -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)
             {
diff --git a/src/tests/baseservices/exceptions/simple/ParallelCrashTester.csproj b/src/tests/baseservices/exceptions/simple/ParallelCrashTester.csproj
index f60f1f053aaa5e..d298cd5e42dd58 100644
--- a/src/tests/baseservices/exceptions/simple/ParallelCrashTester.csproj
+++ b/src/tests/baseservices/exceptions/simple/ParallelCrashTester.csproj
@@ -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" />
diff --git a/src/tests/baseservices/threading/threadpool/bindhandle/Directory.Build.props b/src/tests/baseservices/threading/threadpool/bindhandle/Directory.Build.props
new file mode 100644
index 00000000000000..4345c59e4e14b1
--- /dev/null
+++ b/src/tests/baseservices/threading/threadpool/bindhandle/Directory.Build.props
@@ -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>
diff --git a/src/tests/issues.targets b/src/tests/issues.targets
index d8e74aacc80091..d781f23977fb84 100644
--- a/src/tests/issues.targets
+++ b/src/tests/issues.targets
@@ -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>