Test merging baseservices/threading (#83143)

* Removing cs test entrypoint args * Running ILTransform -n * Running ILTransform -prociso * Running ILTransform -public * Running ILTransform -ilfact * Adding JIT/Directed merge tests wrapper * Patching merge wrapper generator code * Fixing accesibility problems after wrapper generator updates
dotnet · Mar 14, 2023 · a78f9bd · a78f9bd
1 parent d6b89c6
commit a78f9bd
Show file tree

Hide file tree

Showing 365 changed files with 654 additions and 388 deletions.
diff --git a/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs b/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs
@@ -305,10 +305,15 @@ private static string GenerateStandaloneSimpleTestRunner(ImmutableArray<ITestInf
         ITestReporterWrapper reporter = new NoTestReporting();
         StringBuilder builder = new();
         builder.AppendLine(string.Join("\n", aliasMap.Values.Where(alias => alias != "global").Select(alias => $"extern alias {alias};")));
+        builder.AppendLine("namespace __GeneratedMainWrapper;");
+        builder.AppendLine("class __GeneratedMainWrapper {");
+        builder.AppendLine("public static int Main() {");
         builder.AppendLine("try {");
         builder.AppendLine(string.Join("\n", testInfos.Select(m => m.GenerateTestExecution(reporter))));
         builder.AppendLine("} catch(System.Exception ex) { System.Console.WriteLine(ex.ToString()); return 101; }");
         builder.AppendLine("return 100;");
+        builder.AppendLine("}");
+        builder.AppendLine("}");
         return builder.ToString();
     }
 

diff --git a/src/tests/Loader/classloader/Casting/punning.cs b/src/tests/Loader/classloader/Casting/punning.cs
@@ -9,7 +9,7 @@
 partial class Program
 {
     [Fact]
-    static void Via_GetFunctionPointer()
+    internal static void Via_GetFunctionPointer()
     {
         Console.WriteLine($"Running {nameof(Via_GetFunctionPointer)}...");
 
@@ -24,7 +24,7 @@ static void Via_GetFunctionPointer()
     }
 
     [Fact]
-    static void Via_GetFunctionPointer_Generics()
+    internal static void Via_GetFunctionPointer_Generics()
     {
         Console.WriteLine($"Running {nameof(Via_GetFunctionPointer_Generics)}...");
 
@@ -39,7 +39,7 @@ static void Via_GetFunctionPointer_Generics()
     }
 
     [Fact]
-    static void Via_Ldftn()
+    internal static void Via_Ldftn()
     {
         Console.WriteLine($"Running {nameof(Via_Ldftn)}...");
 
@@ -54,7 +54,7 @@ static void Via_Ldftn()
     }
 
     [Fact]
-    static void Via_Ldftn_Generics()
+    internal static void Via_Ldftn_Generics()
     {
         Console.WriteLine($"Running {nameof(Via_Ldftn_Generics)}...");
 
@@ -69,7 +69,7 @@ static void Via_Ldftn_Generics()
     }
 
     [Fact]
-    static void Via_Ldftn_Generics_Virtual()
+    internal static void Via_Ldftn_Generics_Virtual()
     {
         Console.WriteLine($"Running {nameof(Via_Ldftn_Generics_Virtual)}...");
 
@@ -85,7 +85,7 @@ static void Via_Ldftn_Generics_Virtual()
     }
 
     [Fact]
-    static void Via_Ldftn_Generics_EarlyLoad()
+    internal static void Via_Ldftn_Generics_EarlyLoad()
     {
         Console.WriteLine($"Running {nameof(Via_Ldftn_Generics_EarlyLoad)}...");
 
@@ -100,7 +100,7 @@ static void Via_Ldftn_Generics_EarlyLoad()
     }
 
     [Fact]
-    static void Via_Ldftn_Generics_Virtual_EarlyLoad()
+    internal static void Via_Ldftn_Generics_Virtual_EarlyLoad()
     {
         Console.WriteLine($"Running {nameof(Via_Ldftn_Generics_Virtual_EarlyLoad)}...");
 
@@ -116,7 +116,7 @@ static void Via_Ldftn_Generics_Virtual_EarlyLoad()
     }
 
     [Fact]
-    static void Via_Ldvirtftn()
+    internal static void Via_Ldvirtftn()
     {
         Console.WriteLine($"Running {nameof(Via_Ldvirtftn)}...");
 
@@ -132,7 +132,7 @@ static void Via_Ldvirtftn()
     }
 
     [Fact]
-    static void Via_Ldvirtftn_Generics()
+    internal static void Via_Ldvirtftn_Generics()
     {
         Console.WriteLine($"Running {nameof(Via_Ldvirtftn_Generics)}...");
 
@@ -148,7 +148,7 @@ static void Via_Ldvirtftn_Generics()
     }
 
     [Fact]
-    static void Via_Ldvirtftn_Generics_EarlyLoad()
+    internal static void Via_Ldvirtftn_Generics_EarlyLoad()
     {
         Console.WriteLine($"Running {nameof(Via_Ldvirtftn_Generics_EarlyLoad)}...");
 

diff --git a/src/tests/baseservices/threading/DeadThreads/DeadThreads.cs b/src/tests/baseservices/threading/DeadThreads/DeadThreads.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
+using Xunit;
 
 public class DeadThreads
 {
@@ -34,7 +35,8 @@ private static void StartNoOpThread()
         t.Start();
     }
 
-    public static int Main()
+    [Fact]
+    public static int TestEntryPoint()
     {
         GCTriggerSanityTest();
         return 100;

diff --git a/src/tests/baseservices/threading/DeadThreads/DeadThreads.csproj b/src/tests/baseservices/threading/DeadThreads/DeadThreads.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestEnvironmentVariable -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildProjectName).cs" />

diff --git a/src/tests/baseservices/threading/Directory.Build.props b/src/tests/baseservices/threading/Directory.Build.props
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <BuildAsStandalone Condition="'$(BuildAsStandalone)' == ''">false</BuildAsStandalone>
+
+    <AssemblyName Condition="'$(BuildAsStandalone)' != 'true'">$(MSBuildProjectName.Replace('_il_d', '').Replace('_il_r', ''))</AssemblyName>
+  </PropertyGroup>
+
+  <Import Project="..\..\Directory.Build.props" />
+</Project>
diff --git a/src/tests/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.cs b/src/tests/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.cs
@@ -6,12 +6,14 @@
 using System.Text;
 // using System.Configuration;
 using System.Runtime.InteropServices;
+using Xunit;
 
 namespace StackCommitTest
 {
-    class DefaultStackCommit
+    public class DefaultStackCommit
     {
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             int result = 1;
             bool commitEnabled = false;

diff --git a/src/tests/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.csproj b/src/tests/baseservices/threading/commitstackonlyasneeded/DefaultStackCommit.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <!-- Needed for CLRTestTargetUnsupported -->
+    <RequiresProcessIsolation>true</RequiresProcessIsolation>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test unsupported outside of windows -->

diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.cs
@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		int 		  rValue = 100;
 		AutoResetEvent    are  = null;
 

diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_ARENullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>

diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.cs
@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		int 		  rValue = 100;
 		ManualResetEvent  mre  = null;
 

diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_MRENullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>

diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.cs
@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		int    rValue = 100;
 		Mutex  mut    = null;
 

diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_MutexNullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>

diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.cs
@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		int                   rValue = 100;
 		RegisteredWaitHandle  rwh    = null;
 

diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_RWHNullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>

diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.cs
@@ -4,9 +4,11 @@
 using System.Threading;
 // using System.Runtime.Remoting;
 using System.Runtime.Serialization;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		int                           rValue = 100;
 		SynchronizationLockException  sle    = null;
 

diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_SLENullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>

diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.cs
@@ -3,9 +3,11 @@
 using System;
 using System.Threading;
 using System.Runtime.Serialization;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		int                      rValue = 100;
 		ThreadStateException     ta     = null;
 

diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_TSNullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>

diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.cs
@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 
 		int   rValue = 100;
 		Timer time   = null;

diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_TimerNullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>

diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.cs b/src/tests/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.cs
@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 public class mytest {
-	public static int Main() {
+	[Fact]
+	public static int TestEntryPoint() {
 		int         rValue = 100;
 		WaitHandle  wh     = null;
 

diff --git a/src/tests/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.csproj b/src/tests/baseservices/threading/coverage/Nullref/CS_WHNullRefEx.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>

diff --git a/src/tests/baseservices/threading/coverage/OSThreadId/OSThreadId.cs b/src/tests/baseservices/threading/coverage/OSThreadId/OSThreadId.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Reflection;
 using System.Threading;
+using Xunit;
 
 namespace Threading.Tests
 {
@@ -12,7 +13,8 @@ public sealed class OSThreadId
         private static ManualResetEvent s_resetEvent = new ManualResetEvent(false);
         private static ulong[] s_threadIds = new ulong[NumThreads];
 
-        public static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             // The property to be tested is internal.
             Type runtimeThreadType = typeof(object).Assembly.GetType("System.Threading.Thread");

diff --git a/src/tests/baseservices/threading/coverage/OSThreadId/osthreadid.csproj b/src/tests/baseservices/threading/coverage/OSThreadId/osthreadid.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/tests/baseservices/threading/delegate/BeginInvokeEndInvoke.cs b/src/tests/baseservices/threading/delegate/BeginInvokeEndInvoke.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 using System;
 using System.Threading;
+using Xunit;
 
 namespace DelegateTest
 {
@@ -13,10 +14,11 @@ public static string TestMethod(int input)
         }
     }
 
-    class BeginInvokeEndInvokeTest
+    public class BeginInvokeEndInvokeTest
     {
         public delegate string AsyncMethodCaller(int input);
-        static int Main()
+        [Fact]
+        public static int TestEntryPoint()
         {
             IAsyncResult result = null;
             AsyncMethodCaller caller = new AsyncMethodCaller(DelegateCommon.TestMethod);

diff --git a/src/tests/baseservices/threading/delegate/BeginInvokeEndInvoke.csproj b/src/tests/baseservices/threading/delegate/BeginInvokeEndInvoke.csproj
@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>