Remove tests in IL2CPP.

Update to Unity 2021.3.29f1.
timcassell · Sep 11, 2023 · c41f688 · c41f688
1 parent a0bece1
commit c41f688
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/unity-tests.yml b/.github/workflows/unity-tests.yml
@@ -71,7 +71,7 @@ jobs:
             }
         # Editor uses 2018.4 to test Net3.5 and Net4.x.
         # Standalone uses 2019.4 and 2021.3 to test IL2CPP with netstandard 2.0 and netstandard2.1.
-        unityVersion: [2018.4.36f1, 2019.4.40f1, 2021.3.15f1]
+        unityVersion: [2018.4.36f1, 2019.4.40f1, 2021.3.29f1]
         devMode:
           - {
               name: devMode,
@@ -95,7 +95,7 @@ jobs:
             }
           - {
               testMode: { name: Editor },
-              unityVersion: 2021.3.15f1
+              unityVersion: 2021.3.29f1
             }
           # Standalone with IL2CPP can only be built with 2019.4+ (unity-builder docker images constraint), which doesn't support Net3.5.
           - {

diff --git a/Package/Tests/CoreTests/APIs/MergeSettledTests.cs b/Package/Tests/CoreTests/APIs/MergeSettledTests.cs
@@ -41,6 +41,9 @@ public void Teardown()
             TestHelper.Cleanup();
         }
 
+#if !ENABLE_IL2CPP
+        // IL2CPP does not support MakeGenericMethod and MakeGenericType, so remove these tests from the IL2CPP build.
+
         private class TupleWrapper : ITuple
         {
             private readonly ArrayList list = new ArrayList(7);
@@ -358,6 +361,8 @@ public void MergeSettledWorksProperly(MergeSettledArg[] args)
             Assert.IsTrue(invoked);
         }
 
+#endif // !ENABLE_IL2CPP
+
 #if PROMISE_PROGRESS
         [Test]
         public void MergeSettledProgressIsNormalized0(