Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions build-tools/automation/yaml-templates/stage-package-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,6 @@ stages:
artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Mono.Android.NET_Tests-Signed.apk
artifactFolder: $(DotNetTargetFramework)-NoAab

- template: /build-tools/automation/yaml-templates/apk-instrumentation.yaml
parameters:
configuration: $(XA.Build.Configuration)
testName: Mono.Android.NET_Tests-Interpreter
project: tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
extraBuildArgs: -p:TestsFlavor=Interpreter -p:UseInterpreter=True -p:UseMonoRuntime=true
artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Mono.Android.NET_Tests-Signed.aab
artifactFolder: $(DotNetTargetFramework)-Interpreter

- ${{ if ne(parameters.macTestAgentsUseCleanImages, true) }}:
- template: /build-tools/automation/yaml-templates/start-stop-emulator.yaml
parameters:
Expand Down Expand Up @@ -151,42 +142,6 @@ stages:

- template: /build-tools/automation/yaml-templates/start-stop-emulator.yaml

- template: /build-tools/automation/yaml-templates/apk-instrumentation.yaml
parameters:
configuration: $(XA.Build.Configuration)
testName: Mono.Android.NET_Tests-NoAot
project: tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
extraBuildArgs: -p:TestsFlavor=NoAot -p:RunAOTCompilation=false -p:UseMonoRuntime=true
artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Mono.Android.NET_Tests-Signed.aab
artifactFolder: $(DotNetTargetFramework)-NoAot

- template: /build-tools/automation/yaml-templates/apk-instrumentation.yaml
parameters:
configuration: $(XA.Build.Configuration)
testName: Mono.Android.NET_Tests-TrimModePartial
project: tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
extraBuildArgs: -p:TestsFlavor=TrimModePartial -p:TrimMode=partial -p:UseMonoRuntime=true
artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Mono.Android.NET_Tests-Signed.aab
artifactFolder: $(DotNetTargetFramework)-TrimModePartial

- template: /build-tools/automation/yaml-templates/apk-instrumentation.yaml
parameters:
configuration: $(XA.Build.Configuration)
testName: Mono.Android.NET_Tests-AotLlvm
project: tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
extraBuildArgs: -p:TestsFlavor=AotLlvm -p:EnableLLVM=true -p:AndroidEnableProfiledAot=false -p:UseMonoRuntime=true
artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Mono.Android.NET_Tests-Signed.aab
artifactFolder: $(DotNetTargetFramework)-AotLlvm

- template: /build-tools/automation/yaml-templates/apk-instrumentation.yaml
parameters:
configuration: $(XA.Build.Configuration)
testName: Mono.Android.NET_Tests-IsAssignableFrom
project: tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
extraBuildArgs: -p:TestsFlavor=IsAssignableFrom -p:IncludeCategories=Intune -p:_AndroidIsAssignableFromCheck=false -p:UseMonoRuntime=true
artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Mono.Android.NET_Tests-Signed.aab
artifactFolder: $(DotNetTargetFramework)-IsAssignableFrom

- template: /build-tools/automation/yaml-templates/apk-instrumentation.yaml
parameters:
configuration: $(XA.Build.Configuration)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ void TestAidl (string testName, string aidl, AndroidRuntime runtime)
}

[Test]
public void ListAndMap ([Values] AndroidRuntime runtime)
public void ListAndMap ([Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
{
if (IgnoreUnsupportedConfiguration (runtime, release: true)) {
return;
Expand All @@ -46,7 +46,7 @@ interface Test {
}

[Test]
public void NamespaceResolution ([Values] AndroidRuntime runtime)
public void NamespaceResolution ([Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
{
if (IgnoreUnsupportedConfiguration (runtime, release: true)) {
return;
Expand All @@ -64,7 +64,7 @@ interface Test {
}

[Test]
public void PrimitiveTypes ([Values] AndroidRuntime runtime)
public void PrimitiveTypes ([Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
{
if (IgnoreUnsupportedConfiguration (runtime, release: true)) {
return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class AndroidDependenciesTests : BaseTest
{
[Test]
[NonParallelizable] // Do not run environment modifying tests in parallel.
public void InstallAndroidDependenciesTest ([Values ("GoogleV2", "Xamarin")] string manifestType, [Values] AndroidRuntime runtime)
public void InstallAndroidDependenciesTest ([Values ("GoogleV2", "Xamarin")] string manifestType, [Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
{
bool isRelease = runtime == AndroidRuntime.NativeAOT;
if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
Expand Down Expand Up @@ -134,7 +134,7 @@ static IEnumerable<object[]> Get_GetDependencyNdkRequiredConditionsData ()
{
var ret = new List<object[]> ();

foreach (AndroidRuntime runtime in Enum.GetValues (typeof (AndroidRuntime))) {
foreach (AndroidRuntime runtime in new[] { AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT }) {
AddTestData ("AotAssemblies", false, runtime);
AddTestData ("AndroidEnableProfiledAot", false, runtime);
AddTestData ("EnableLLVM", true, runtime);
Expand Down Expand Up @@ -220,7 +220,7 @@ public void NativeAotRequiresNdk_WhenWorkloadLinkerDisabled ()
}

[Test]
public void GetDependencyWhenBuildToolsAreMissingTest ([Values] AndroidRuntime runtime)
public void GetDependencyWhenBuildToolsAreMissingTest ([Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
{
const bool isRelease = true;
if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
Expand Down Expand Up @@ -260,7 +260,7 @@ public void GetDependencyWhenBuildToolsAreMissingTest ([Values] AndroidRuntime r
}

[Test]
public void GetDependencyWhenSDKIsMissingTest ([Values] bool createSdkDirectory, [Values] bool installJavaDeps, [Values] AndroidRuntime runtime)
public void GetDependencyWhenSDKIsMissingTest ([Values] bool createSdkDirectory, [Values] bool installJavaDeps, [Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
{
const bool isRelease = true;
if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public void GradleTestTearDown ()
}

[Test]
public void BuildApp ([Values] AndroidRuntime runtime)
public void BuildApp ([Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
{
bool isRelease = runtime == AndroidRuntime.NativeAOT;
if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
Expand Down Expand Up @@ -73,7 +73,7 @@ static IEnumerable<object[]> Get_AGPMetadataTestSources ()
{
var ret = new List<object[]> ();

foreach (AndroidRuntime runtime in Enum.GetValues (typeof (AndroidRuntime))) {
foreach (AndroidRuntime runtime in new[] { AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT }) {
AddTestData (
bind: true,
configuration: "Release",
Expand Down Expand Up @@ -162,7 +162,7 @@ public void BindLibrary (bool bind, string configuration, bool refOutputs, Andro
}

[Test]
public void BindPackLibrary ([Values] bool packGradleRef, [Values] AndroidRuntime runtime)
public void BindPackLibrary ([Values] bool packGradleRef, [Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
{
const bool isRelease = true;
if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
Expand Down Expand Up @@ -208,7 +208,7 @@ public void BindPackLibrary ([Values] bool packGradleRef, [Values] AndroidRuntim
}

[Test]
public void BuildIncremental ([Values] AndroidRuntime runtime)
public void BuildIncremental ([Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
{
bool isRelease = runtime == AndroidRuntime.NativeAOT;
if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
Expand Down Expand Up @@ -260,7 +260,7 @@ public void BuildIncremental ([Values] AndroidRuntime runtime)
}

[Test]
public void BuildCustomOutputPaths ([Values] AndroidRuntime runtime)
public void BuildCustomOutputPaths ([Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
{
bool isRelease = runtime == AndroidRuntime.NativeAOT;
if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
Expand Down Expand Up @@ -294,7 +294,7 @@ public void BuildCustomOutputPaths ([Values] AndroidRuntime runtime)
}

[Test]
public void BuildArtifactsOutputPaths ([Values] AndroidRuntime runtime)
public void BuildArtifactsOutputPaths ([Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
{
bool isRelease = runtime == AndroidRuntime.NativeAOT;
if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
Expand Down Expand Up @@ -344,7 +344,7 @@ public void BuildArtifactsOutputPaths ([Values] AndroidRuntime runtime)
}

[Test]
public void BuildMultipleModules ([Values] AndroidRuntime runtime)
public void BuildMultipleModules ([Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
{
bool isRelease = runtime == AndroidRuntime.NativeAOT;
if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
Expand Down Expand Up @@ -387,7 +387,7 @@ public void BuildMultipleModules ([Values] AndroidRuntime runtime)
}

[Test]
public void BuildMultipleLibraries ([Values] AndroidRuntime runtime)
public void BuildMultipleLibraries ([Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
{
bool isRelease = runtime == AndroidRuntime.NativeAOT;
if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
Expand Down Expand Up @@ -433,7 +433,7 @@ public void BuildMultipleLibraries ([Values] AndroidRuntime runtime)
}

[Test]
public void InvalidItemRefError ([Values] AndroidRuntime runtime)
public void InvalidItemRefError ([Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
{
bool isRelease = runtime == AndroidRuntime.NativeAOT;
if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
Expand All @@ -457,7 +457,7 @@ public void InvalidItemRefError ([Values] AndroidRuntime runtime)
}

[Test]
public void InvalidModuleNameError ([Values] AndroidRuntime runtime)
public void InvalidModuleNameError ([Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
{
bool isRelease = runtime == AndroidRuntime.NativeAOT;
if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
Expand Down Expand Up @@ -486,7 +486,7 @@ public void InvalidModuleNameError ([Values] AndroidRuntime runtime)
}

[Test]
public void BindFacebook ([Values] AndroidRuntime runtime)
public void BindFacebook ([Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime)
{
bool isRelease = runtime == AndroidRuntime.NativeAOT;
if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
Expand Down
Loading
Loading