Deduplicate JIT/Methodical/tailcall tests and make them mergeable

src/tests/JIT/Methodical/tailcall/Desktop/thread-race.cs

@@ -3,16 +3,18 @@
 
 using System;
 using System.Threading;
+using Xunit;
 
-internal class Repro
+public class Repro
 {
     private static volatile bool s_threadsCompleted;
     private static volatile Mutex s_myMutex;
     private static volatile int[] s_threadSum;
     private const int FibSeriesMax = 35;
     private const int FibSeriesMin = 20;
 
-    public static int Main()
+    [Fact]
+    public static int TestEntrypoint()
     {
         // Compute the expected value for a single thread
         int expectedSingle = 0;

src/tests/JIT/Methodical/tailcall/Desktop/thread-race_il_r.csproj → src/tests/JIT/Methodical/tailcall/Desktop/thread-race_r.csproj

@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <!-- NOTE: this test simply takes too long to complete under heap verify or GCStress. It is not fundamentally incompatible. -->
     <HeapVerifyIncompatible>true</HeapVerifyIncompatible>
     <GCStressIncompatible>true</GCStressIncompatible>

src/tests/JIT/Methodical/tailcall/compat_enum.il

@@ -9,20 +9,20 @@
 }
 .assembly compat_enum { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_compat_enum
 {
   .class private auto ansi serializable sealed TestEnum extends [mscorlib]System.Enum
   {
     .field public specialname rtspecialname int32 value__
-    .field public static literal value class JitTest.TestEnum v = int32(0x00000000)
-    .field public static literal value class JitTest.TestEnum w = int32(0x00000001)
+    .field public static literal value class JitTest_compat_enum.TestEnum v = int32(0x00000000)
+    .field public static literal value class JitTest_compat_enum.TestEnum w = int32(0x00000001)
   }
-  .class private auto ansi beforefieldinit TestClass extends [mscorlib]System.Object
+  .class public auto ansi beforefieldinit TestClass extends [mscorlib]System.Object
   {
-    .method private hidebysig static value class JitTest.TestEnum callee() il managed
+    .method private hidebysig static value class JitTest_compat_enum.TestEnum callee() il managed
     {
 		.maxstack  8
-		.locals (value class JitTest.TestEnum V_0)
+		.locals (value class JitTest_compat_enum.TestEnum V_0)
 		ldc.i4.1
 		stloc.0
 		ldloc.0
@@ -32,11 +32,11 @@
     {
       // Code size       10 (0xa)
       .maxstack  8
-      tail. call       value class JitTest.TestEnum JitTest.TestClass::callee()
+      tail. call       value class JitTest_compat_enum.TestEnum JitTest_compat_enum.TestClass::callee()
       ret
     } // end of method TestClass::caller
 
-    .method private hidebysig static 
+    .method public hidebysig static 
             int32 Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -46,7 +46,7 @@
       // Code size       40 (0x28)
       .maxstack  2
       .locals (int32 V_0)
-      IL_0000:  call       int32 JitTest.TestClass::caller()
+      IL_0000:  call       int32 JitTest_compat_enum.TestClass::caller()
       IL_0005:  ldc.i4.1
       IL_0006:  bne.un.s   IL_0017
 
@@ -78,6 +78,6 @@
 
   } // end of class TestClass
 
-} // end of namespace JitTest
+} // end of namespace JitTest_compat_enum
 
 //*********** DISASSEMBLY COMPLETE ***********************

src/tests/JIT/Methodical/tailcall/compat_enum_il_d.ilproj

@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
   </PropertyGroup>

src/tests/JIT/Methodical/tailcall/compat_enum_il_r.ilproj

@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
   </PropertyGroup>

src/tests/JIT/Methodical/tailcall/compat_i2_bool.il

@@ -9,9 +9,9 @@
 }
 .assembly compat_i2_bool { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_compat_i2_bool
 {
-  .class private auto ansi beforefieldinit Test
+  .class public auto ansi beforefieldinit Test
          extends [mscorlib]System.Object
   {
     .method private hidebysig  static 
@@ -65,11 +65,11 @@
       IL_0050:  call       void [mscorlib]System.GC::Collect()
       IL_0055:  call       void [mscorlib]System.GC::Collect()
       IL_005a:  tail.
-      IL_005c:  call       int16 JitTest.Test::Method1()
+      IL_005c:  call       int16 JitTest_compat_i2_bool.Test::Method1()
       IL_0061:  ret
     } // end of method Test::Method2
 
-    .method private hidebysig  static 
+    .method public hidebysig  static 
             int32 Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -79,7 +79,7 @@
       // Code size       40 (0x28)
       .maxstack  2
       .locals (int32 V_0)
-      IL_0000:  call       bool JitTest.Test::Method2()
+      IL_0000:  call       bool JitTest_compat_i2_bool.Test::Method2()
       IL_0005:  ldc.i4.s   10
       IL_0007:  beq.s      IL_0017
 
@@ -111,6 +111,6 @@
 
   } // end of class Test
 
-} // end of namespace JitTest
+} // end of namespace JitTest_compat_i2_bool
 
 //*********** DISASSEMBLY COMPLETE ***********************

src/tests/JIT/Methodical/tailcall/compat_i2_bool_il_d.ilproj

@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

src/tests/JIT/Methodical/tailcall/compat_i2_bool_il_r.ilproj

@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

src/tests/JIT/Methodical/tailcall/compat_i4_i1.il

@@ -9,9 +9,9 @@
 }
 .assembly compat_i4_i1 { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_compat_i4_i1
 {
-  .class private auto ansi beforefieldinit Test
+  .class public auto ansi beforefieldinit Test
          extends [mscorlib]System.Object
   {
     .method private hidebysig  static 
@@ -65,11 +65,11 @@
       IL_0050:  call       void [mscorlib]System.GC::Collect()
       IL_0055:  call       void [mscorlib]System.GC::Collect()
       IL_005a:  tail.
-      IL_005c:  call       int32 JitTest.Test::Method1()
+      IL_005c:  call       int32 JitTest_compat_i4_i1.Test::Method1()
       IL_0061:  ret
     } // end of method Test::Method2
 
-    .method private hidebysig  static 
+    .method public hidebysig  static 
             int32 Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -79,7 +79,7 @@
       // Code size       40 (0x28)
       .maxstack  2
       .locals (int32 V_0)
-      IL_0000:  call       int8 JitTest.Test::Method2()
+      IL_0000:  call       int8 JitTest_compat_i4_i1.Test::Method2()
       IL_0005:  ldc.i4.s   10
       IL_0007:  beq.s      IL_0017
 
@@ -111,6 +111,6 @@
 
   } // end of class Test
 
-} // end of namespace JitTest
+} // end of namespace JitTest_compat_i4_i1
 
 //*********** DISASSEMBLY COMPLETE ***********************

src/tests/JIT/Methodical/tailcall/compat_i4_i1_il_d.ilproj

@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

src/tests/JIT/Methodical/tailcall/compat_i4_i1_il_r.ilproj

@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

src/tests/JIT/Methodical/tailcall/compat_i4_u.il

@@ -9,9 +9,9 @@
 }
 .assembly compat_i4_u { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_compat_i4_u
 {
-  .class private auto ansi beforefieldinit Test
+  .class public auto ansi beforefieldinit Test
          extends [mscorlib]System.Object
   {
     .method private hidebysig static 
@@ -65,11 +65,11 @@
       IL_0050:  call       void [mscorlib]System.GC::Collect()
       IL_0055:  call       void [mscorlib]System.GC::Collect()
       IL_005a:  tail.
-      IL_005c:  call       int32 JitTest.Test::Method1()
+      IL_005c:  call       int32 JitTest_compat_i4_u.Test::Method1()
       IL_0061:  ret
     } // end of method Test::Method2
 
-    .method private hidebysig static 
+    .method public hidebysig static 
             int32 Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -79,7 +79,7 @@
       // Code size       40 (0x28)
       .maxstack  2
       .locals (int32 V_0)
-      IL_0000:  call       native unsigned int JitTest.Test::Method2()
+      IL_0000:  call       native unsigned int JitTest_compat_i4_u.Test::Method2()
       IL_0005:  ldc.i4.s   10
       IL_0007:  beq.s      IL_0017
 
@@ -111,6 +111,6 @@
 
   } // end of class Test
 
-} // end of namespace JitTest
+} // end of namespace JitTest_compat_i4_u
 
 //*********** DISASSEMBLY COMPLETE ***********************

src/tests/JIT/Methodical/tailcall/compat_i4_u_il_d.ilproj

@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>
   </PropertyGroup>

src/tests/JIT/Methodical/tailcall/compat_i4_u_il_r.ilproj

@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-  </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>
   </PropertyGroup>

src/tests/JIT/Methodical/tailcall/compat_i_u2.il

@@ -9,9 +9,9 @@
 }
 .assembly compat_i_u2 { }
 .assembly extern xunit.core {}
-.namespace JitTest
+.namespace JitTest_compat_i_u2
 {
-  .class private auto ansi beforefieldinit Test
+  .class public auto ansi beforefieldinit Test
          extends [mscorlib]System.Object
   {
     .method private hidebysig  static 
@@ -65,11 +65,11 @@
       IL_0050:  call       void [mscorlib]System.GC::Collect()
       IL_0055:  call       void [mscorlib]System.GC::Collect()
       IL_005a:  tail.
-      IL_005c:  call       native int JitTest.Test::Method1()
+      IL_005c:  call       native int JitTest_compat_i_u2.Test::Method1()
       IL_0061:  ret
     } // end of method Test::Method2
 
-    .method private hidebysig  static 
+    .method public hidebysig  static 
             int32 Main() il managed
     {
       .custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
@@ -79,7 +79,7 @@
       // Code size       40 (0x28)
       .maxstack  2
       .locals (int32 V_0)
-      IL_0000:  call       unsigned int16 JitTest.Test::Method2()
+      IL_0000:  call       unsigned int16 JitTest_compat_i_u2.Test::Method2()
       IL_0005:  ldc.i4.s   10
       IL_0007:  beq.s      IL_0017
 
@@ -111,6 +111,6 @@
 
   } // end of class Test
 
-} // end of namespace JitTest
+} // end of namespace JitTest_compat_i_u2
 
 //*********** DISASSEMBLY COMPLETE ***********************

src/tests/JIT/Methodical/tailcall/compat_i_u2_il_d.ilproj

@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>

src/tests/JIT/Methodical/tailcall/compat_i_u2_il_r.ilproj

@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <CLRTestPriority>1</CLRTestPriority>
   </PropertyGroup>
   <PropertyGroup>