Merge a couple NativeAOT smoke tests (#65426)

Shaves off a couple dozen seconds of test build time.

Author: MichalStrehovsky

src/tests/nativeaot/SmokeTests/BasicThreading/BasicThreading.csproj

@@ -3,6 +3,7 @@
 
 using System;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -129,6 +130,10 @@ class Test<T>
             public override string ToString() => "TotallyUniqueString";
         }
 
+        [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2057:UnrecognizedReflectionPattern",
+            Justification = "Hiding the parameter to Type.GetType on purpose")]
+        [UnconditionalSuppressMessage("AotAnalysis", "IL3050:UnrecognizedReflectionPattern",
+            Justification = "MakeGenericType is over a reference type")]
         public static int Run()
         {
             // Obscure `typeof(string)` so that dataflow analysis can't see it and the MakeGenericType

src/tests/nativeaot/SmokeTests/ControlFlowGuard/ControlFlowGuard.cs

@@ -7,12 +7,12 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-class Program
+class BasicThreading
 {
     public const int Pass = 100;
     public const int Fail = -1;
 
-    static int Main()
+    internal static int Run()
     {
         SimpleReadWriteThreadStaticTest.Run(42, "SimpleReadWriteThreadStatic");
 
@@ -54,12 +54,12 @@ public static int Run()
         if (visited)
         {
             Console.WriteLine("FinalizeTest passed");
-            return Program.Pass;
+            return BasicThreading.Pass;
         }
         else
         {
             Console.WriteLine("FinalizeTest failed");
-            return Program.Fail;
+            return BasicThreading.Fail;
         }
     }
 }
@@ -510,7 +510,7 @@ public static int Run()
 
         TestConcurrentIsBackgroundProperty();
 
-        return (s_failed == 0) ? Program.Pass : Program.Fail;
+        return (s_failed == 0) ? BasicThreading.Pass : BasicThreading.Fail;
     }
 
     /// <summary>
@@ -605,7 +605,7 @@ public static int Run()
         if (!timerFired)
         {
             Console.WriteLine("The timer test failed: timer has not fired.");
-            return Program.Fail;
+            return BasicThreading.Fail;
         }
 
         // Change the timer to a very long value
@@ -615,7 +615,7 @@ public static int Run()
         if (timerFired)
         {
             Console.WriteLine("The timer test failed: timer fired earlier than expected.");
-            return Program.Fail;
+            return BasicThreading.Fail;
         }
 
         // Try change existing timer to a small value and make sure it fires
@@ -625,7 +625,7 @@ public static int Run()
         if (!timerFired)
         {
             Console.WriteLine("The timer test failed: failed to change the existing timer.");
-            return Program.Fail;
+            return BasicThreading.Fail;
         }
 
         // Test a periodic timer
@@ -638,14 +638,14 @@ public static int Run()
             if (!timerFired)
             {
                 Console.WriteLine("The timer test failed: the periodic timer has not fired.");
-                return Program.Fail;
+                return BasicThreading.Fail;
             }
         }
 
         // Stop the periodic timer
         s_timer.Change(Timeout.Infinite, Timeout.Infinite);
 
-        return Program.Pass;
+        return BasicThreading.Pass;
     }
 
     private static void TimerCallback(object state)

src/tests/nativeaot/SmokeTests/Delegates/Delegates.csproj

@@ -6,12 +6,12 @@
 
 using Pointer = System.Reflection.Pointer;
 
-public class BringUpTests
+public class Delegates
 {
     const int Pass = 100;
     const int Fail = -1;
 
-    public static int Main()
+    public static int Run()
     {
         int result = Pass;
 

src/tests/nativeaot/SmokeTests/Interfaces/Interfaces.csproj

@@ -6,9 +6,9 @@
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 
-class Program
+class Generics
 {
-    static int Main()
+    internal static int Run()
     {
         TestDictionaryDependencyTracking.Run();
         TestStaticBaseLookups.Run();
@@ -2748,9 +2748,9 @@ class Atom3 { }
         public static void Run()
         {
             var derived = new Derived<Atom1, Atom2>();
-            if (ConstrainedCall<Derived<Atom1, Atom2>, Atom2, Atom3>(ref derived) != "Derived<Program+TestConstrainedGvmCalls+Atom1,Program+TestConstrainedGvmCalls+Atom2>.Method<Program+TestConstrainedGvmCalls+Atom3>()")
+            if (ConstrainedCall<Derived<Atom1, Atom2>, Atom2, Atom3>(ref derived) != "Derived<Generics+TestConstrainedGvmCalls+Atom1,Generics+TestConstrainedGvmCalls+Atom2>.Method<Generics+TestConstrainedGvmCalls+Atom3>()")
                 throw new Exception();
-            if (ConstrainedCall<Derived<Atom1, Atom2>, Atom1, Atom3>(ref derived) != "Base<Program+TestConstrainedGvmCalls+Atom1>.Method<Program+TestConstrainedGvmCalls+Atom3>()")
+            if (ConstrainedCall<Derived<Atom1, Atom2>, Atom1, Atom3>(ref derived) != "Base<Generics+TestConstrainedGvmCalls+Atom1>.Method<Generics+TestConstrainedGvmCalls+Atom3>()")
                 throw new Exception();
         }
     }

src/tests/nativeaot/SmokeTests/Threading/Threading.csproj

@@ -7,12 +7,12 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-public class BringUpTest
+public class Interfaces
 {
     const int Pass = 100;
     const int Fail = -1;
 
-    public static int Main()
+    public static int Run()
     {
         if (TestInterfaceCache() == Fail)
             return Fail;
@@ -576,10 +576,10 @@ public static void Run()
 
             var x = new Derived<Atom1, Atom2>() { InnerValue = "My inner value" };
             string r1 = ((IFace<Atom1>)x).GrabValue(new Atom1());
-            if (r1 != "'My inner value' over 'BringUpTest+TestSharedIntefaceMethods+Atom1' with 'The Atom1'")
+            if (r1 != "'My inner value' over 'Interfaces+TestSharedIntefaceMethods+Atom1' with 'The Atom1'")
                 throw new Exception();
             string r2 = ((IFace<Atom2>)x).GrabValue(new Atom2());
-            if (r2 != "'My inner value' over 'BringUpTest+TestSharedIntefaceMethods+Atom2' with 'The Atom2'")
+            if (r2 != "'My inner value' over 'Interfaces+TestSharedIntefaceMethods+Atom2' with 'The Atom2'")
                 throw new Exception();
 
             IFace<object> o = new Yadda() { InnerValue = "SomeString" };

src/tests/nativeaot/SmokeTests/BasicThreading/BasicThreading.cs renamed to src/tests/nativeaot/SmokeTests/UnitTests/BasicThreading.cs

@@ -0,0 +1,30 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Runtime.CompilerServices;
+
+bool success = RunTest(BasicThreading.Run);
+success &= RunTest(Delegates.Run);
+success &= RunTest(Generics.Run);
+success &= RunTest(Interfaces.Run);
+success &= RunTest(Threading.Run);
+
+return success ? 100 : 1;
+
+static bool RunTest(Func<int> t, [CallerArgumentExpression("t")] string name = null)
+{
+    Console.WriteLine($"===== Running test {name} =====");
+    bool success = true;
+    try
+    {
+        success = t() == 100;
+    }
+    catch (Exception ex)
+    {
+        Console.WriteLine(ex.ToString());
+        success = false;
+    }
+    Console.WriteLine($"===== Test {name} {(success ? "succeeded" : "failed")} =====");
+    return success;
+}

src/tests/nativeaot/SmokeTests/Delegates/Delegates.cs renamed to src/tests/nativeaot/SmokeTests/UnitTests/Delegates.cs

@@ -9,11 +9,11 @@
 
 // TODO: Move these tests to CoreFX once they can be run on CoreRT
 
-internal static class Runner
+internal static class Threading
 {
     private const int Pass = 100;
 
-    public static int Main()
+    public static int Run()
     {
         Console.WriteLine("    WaitSubsystemTests.DoubleSetOnEventWithTimedOutWaiterShouldNotStayInWaitersList");
         WaitSubsystemTests.DoubleSetOnEventWithTimedOutWaiterShouldNotStayInWaitersList();

src/tests/nativeaot/SmokeTests/Generics/Generics.cs renamed to src/tests/nativeaot/SmokeTests/UnitTests/Generics.cs

@@ -11,6 +11,11 @@
 
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="BasicThreading.cs" />
+    <Compile Include="Delegates.cs" />
     <Compile Include="Generics.cs" />
+    <Compile Include="Interfaces.cs" />
+    <Compile Include="Threading.cs" />
+    <Compile Include="Main.cs" />
   </ItemGroup>
 </Project>