[tests] Add a NativeAOT variation of monotouch-test.

xamarin · Apr 28, 2023 · 168ff42 · 168ff42
1 parent 8bdbd06
commit 168ff42
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/tests/monotouch-test/dotnet/iOS/Makefile b/tests/monotouch-test/dotnet/iOS/Makefile
@@ -14,3 +14,9 @@ norm:
 
 run-norm:
 	$(Q) $(MAKE) build BUILD_ARGUMENTS="/p:RuntimeIdentifier=ios-arm64                       /p:MtouchLink=SdkOnly /p:Configuration=Release-norm /bl:$@.binlog /t:Run"
+
+nativeaot:
+	$(Q) $(MAKE) build BUILD_ARGUMENTS="/p:RuntimeIdentifier=ios-arm64 /p:PublishAot=true /p:MtouchLink=SdkOnly /p:Configuration=Release /bl:$@.binlog"
+
+run-nativeaot:
+	$(Q) $(MAKE) build BUILD_ARGUMENTS="/p:RuntimeIdentifier=ios-arm64 /p:PublishAot=true /p:MtouchLink=SdkOnly /p:Configuration=Release /bl:$@.binlog /t:Run"
diff --git a/tests/xharness/Jenkins/TestData.cs b/tests/xharness/Jenkins/TestData.cs
@@ -24,5 +24,6 @@ class TestData {
 		public string XamMacArch;
 		public string RuntimeIdentifier;
 		public string Registrar;
+		public bool PublishAot; // NativeAOT
 	}
 }
diff --git a/tests/xharness/Jenkins/TestVariationsFactory.cs b/tests/xharness/Jenkins/TestVariationsFactory.cs
@@ -98,6 +98,8 @@ IEnumerable<TestData> GetTestData (RunTestTask test)
 					}
 					if (test.TestProject.IsDotNetProject)
 						yield return new TestData { Variation = "Release (LLVM)", Debug = false, UseLlvm = true, Ignored = ignore };
+					if (test.Platform == TestPlatform.iOS && test.TestProject.IsDotNetProject)
+						yield return new TestData { Variation = "Release (NativeAOT)", Debug = false, PublishAot = true, Ignored = ignore };
 					break;
 				case string name when name.StartsWith ("mscorlib", StringComparison.Ordinal):
 					if (supports_debug)
@@ -209,6 +211,7 @@ public IEnumerable<T> CreateTestVariations<T> (IEnumerable<T> tests, Func<MSBuil
 					var runtime_identifer = test_data.RuntimeIdentifier;
 					var use_llvm = test_data.UseLlvm;
 					var registrar = test_data.Registrar;
+					var publishaot = test_data.PublishAot;
 
 					if (task.TestProject.IsDotNetProject)
 						variation += " [dotnet]";
@@ -272,6 +275,8 @@ public IEnumerable<T> CreateTestVariations<T> (IEnumerable<T> tests, Func<MSBuil
 							clone.Xml.SetTopLevelPropertyGroupValue ("RuntimeIdentifier", runtime_identifer);
 						if (!string.IsNullOrEmpty (registrar))
 							clone.Xml.SetTopLevelPropertyGroupValue ("Registrar", registrar);
+						if (publishaot)
+							clone.Xml.SetTopLevelPropertyGroupValue ("PublishAot", "true");
 						clone.Xml.Save (clone.Path);
 					});