Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring up Android device aot on ci #50510

Closed
wants to merge 75 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
33a7a32
Bring up Android device aot on ci
Mar 31, 2021
0d8ff94
Merge remote-tracking branch 'upstream/main' into enable-droid-device…
Apr 1, 2021
01adef8
Bump the aot timeout to see how long it really takes
Apr 1, 2021
450fe1e
See if trimming helps w/ the build time
May 17, 2021
fa5d814
Merge remote-tracking branch 'upstream/main' into enable-droid-device…
May 17, 2021
4409b89
Raise the default number of trampolines
May 17, 2021
3a097ec
Mirroring wasm skips for aot and trimming
May 17, 2021
639fcf0
Skip more suites that fail aot
May 18, 2021
eed28b9
Merge remote-tracking branch 'upstream/main' into enable-droid-device…
May 18, 2021
490f7c5
More exclusions.
May 19, 2021
31f4555
More exclusions
May 19, 2021
8d9ad90
See if default trimming produces better results
May 19, 2021
eb11e93
Make sure to skip problematic tests
May 19, 2021
cb132d1
More skips
May 19, 2021
9f5991c
Trimming switch so the other builds don't fail
May 19, 2021
9baa874
Skip the tests failing due to 'Attempting to JIT compile method while…
MaximLipnin May 25, 2021
c2d528f
Merge branch 'main' into enable-droid-device-aot
MaximLipnin May 25, 2021
5887106
Remove redundant attribute
MaximLipnin May 25, 2021
6a7b42c
Merge branch 'main' into enable-droid-device-aot
MaximLipnin May 26, 2021
6bfe553
Skip more library tests due to "Attempting to JIT compile method ... …
MaximLipnin May 26, 2021
3669c17
Fix wrong attribute
MaximLipnin May 26, 2021
27e6fe0
Add System using
MaximLipnin May 26, 2021
ed1dc03
Merge branch 'main' into enable-droid-device-aot
MaximLipnin May 27, 2021
e680218
Skip more library tests due to "Attempting to JIT compile method ... …
MaximLipnin May 27, 2021
7635795
Avoid some test failures related to DebuggerSupport
MaximLipnin May 27, 2021
dad7cab
Skip a test failing with NRE
MaximLipnin May 27, 2021
b3ceed5
Move ConditionalClass up to the right level
May 27, 2021
db00361
More skipped tests
MaximLipnin May 28, 2021
de9fe15
Merge branch 'main' into enable-droid-device-aot
MaximLipnin May 28, 2021
3a96c05
Merge branch 'enable-droid-device-aot' of https://github.com/steveiso…
MaximLipnin May 28, 2021
4f498b7
More skipped library tests
MaximLipnin May 31, 2021
42e7658
Merge branch 'main' into enable-droid-device-aot
MaximLipnin May 31, 2021
ff94a36
Skip more tests
MaximLipnin Jun 1, 2021
64784c4
Merge branch 'main' into enable-droid-device-aot
MaximLipnin Jun 1, 2021
386d365
Skip more tests
MaximLipnin Jun 1, 2021
1ac9b88
Skip more tests
MaximLipnin Jun 2, 2021
14f9ab0
Merge branch 'main' into enable-droid-device-aot
MaximLipnin Jun 2, 2021
f692894
Skip more tests
MaximLipnin Jun 2, 2021
27452e9
Skip more tests
MaximLipnin Jun 3, 2021
d11612f
Merge branch 'main' into enable-droid-device-aot
MaximLipnin Jun 3, 2021
5620351
Remove an active issue attribute since nimt-trampolines parameter has…
MaximLipnin Jun 3, 2021
846d697
Skip more tests
MaximLipnin Jun 3, 2021
075052e
Skip yet another test suite perhaps due to infra issue
MaximLipnin Jun 3, 2021
88de22f
Merge branch 'main' into enable-droid-device-aot
MaximLipnin Jun 3, 2021
d14d51e
Add active issue links
MaximLipnin Jun 3, 2021
6a9a4cd
Merge branch 'main' into enable-droid-device-aot
MaximLipnin Jun 4, 2021
5870d41
Try re-enabling some test suites which previously had no CI results
MaximLipnin Jun 4, 2021
e6a9602
Add an active issue
MaximLipnin Jun 4, 2021
54e6bae
Add XUnit using to enable ActiveIssue attribute
MaximLipnin Jun 4, 2021
1713dc3
Merge branch 'main' into enable-droid-device-aot
MaximLipnin Jun 7, 2021
33d7684
Merge branch 'main' into enable-droid-device-aot
MaximLipnin Jun 8, 2021
d7eca0b
Merge branch 'main' into enable-droid-device-aot
MaximLipnin Jun 9, 2021
376bdb4
Add '$(RunDisabledAndroidTests)' != 'true'
MaximLipnin Jun 9, 2021
1a6e99f
Add an active issue to the disabled test suites
MaximLipnin Jun 9, 2021
e5b2dab
Try re-using EnableAggressiveTrimming
MaximLipnin Jun 9, 2021
c684fc3
Update tests.proj
MaximLipnin Jun 9, 2021
171d528
Merge branch 'main' into enable-droid-device-aot
MaximLipnin Jun 9, 2021
a7fbfeb
Merge branch 'main' into enable-droid-device-aot
MaximLipnin Jun 10, 2021
8697a56
Use tvOS in PlatformDetection.IsNotDeviceAOT
MaximLipnin Jun 10, 2021
4ecdf5b
Exclude Microsoft.Extensions.DependencyModel.Tests test suite
MaximLipnin Jun 10, 2021
874e9c7
Exclude Microsoft.NETCore.Platforms.BuildTasks.Tests.GenerateRuntimeG…
MaximLipnin Jun 10, 2021
db088de
Using
MaximLipnin Jun 10, 2021
72389de
Enable debugger support
MaximLipnin Jun 10, 2021
2933ae8
More debugger support
MaximLipnin Jun 11, 2021
c1ab593
Same issue as on browser
MaximLipnin Jun 11, 2021
cfb2051
Method is not supported
MaximLipnin Jun 11, 2021
d481664
Merge branch 'main' into enable-droid-device-aot
MaximLipnin Jun 11, 2021
0600168
Bump ngsharedvt-trampolines value up to 8800 ?
MaximLipnin Jun 11, 2021
3755d74
Merge remote-tracking branch 'upstream/main' into enable-droid-device…
Jun 22, 2021
10e2e48
Flip back llvm flag
Jun 22, 2021
41f8319
Merge remote-tracking branch 'upstream/main' into enable-droid-device…
Jun 22, 2021
e26477a
quick fix
Jun 22, 2021
6f33cb9
Merge branch 'main' into enable-droid-device-aot
MaximLipnin Jun 24, 2021
b52642d
Merge branch 'main' into enable-droid-device-aot
MaximLipnin Jun 29, 2021
2cefff0
Re-enable System.Linq.Expressions.Tests test suite to see any failures
MaximLipnin Jun 29, 2021
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
39 changes: 39 additions & 0 deletions eng/pipelines/runtime-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,45 @@ jobs:
eq(variables['monoContainsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build the whole product using Mono and run libraries tests
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/common/global-build-job.yml
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
buildConfig: Release
runtimeFlavor: mono
platforms:
- Android_arm64
variables:
# map dependencies variables to local variables
- name: librariesContainsChange
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
- name: monoContainsChange
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
jobParameters:
testGroup: innerloop
nameSuffix: AllSubsets_AOT_Mono
buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:RunAOTCompilation=true /p:EnableAggressiveTrimming=true
timeoutInMinutes: 180
condition: >-
or(
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
eq(variables['isFullMatrix'], true))
# extra steps, run tests
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
extraStepsParameters:
creator: dotnet-bot
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
condition: >-
or(
eq(variables['librariesContainsChange'], true),
eq(variables['monoContainsChange'], true),
eq(variables['isFullMatrix'], true))

- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/common/global-build-job.yml
Expand Down
3 changes: 3 additions & 0 deletions eng/testing/tests.mobile.targets
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@

<MainLibraryFileName Condition="'$(MainLibraryFileName)' == ''">AndroidTestRunner.dll</MainLibraryFileName>
</PropertyGroup>
<PropertyGroup Condition="'$(RunAOTCompilation)' == 'true'">
<MonoEnableLLVM Condition="'$(MonoEnableLLVM)' == ''">true</MonoEnableLLVM>
</PropertyGroup>
<ItemGroup Condition="'$(RunAOTCompilation)' == 'true'">
<AotInputAssemblies Include="$(PublishDir)\*.dll">
<AotArguments>@(MonoAOTCompilerDefaultAotArguments, ';')</AotArguments>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public void RootDisposesProviders()
Assert.True(provider5.IsDisposed);
}

[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotDeviceAOT))]
public void RootDisposesChangeTokenRegistrations()
{
var changeToken = new ChangeToken();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2416,7 +2416,7 @@ public static IEnumerable<object[]> CopyToAsync_AllDataCopied_MemberData() =>
public virtual async Task CopyToAsync_AllDataCopied_Large(bool useAsync) =>
await CopyToAsync_AllDataCopied(1024 * 1024, useAsync);

[Theory]
[ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotAndroidAOT))] // System.NotSupportedException : Specified method is not supported.
[MemberData(nameof(CopyToAsync_AllDataCopied_MemberData))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51371", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
public virtual async Task CopyToAsync_AllDataCopied(int byteCount, bool useAsync)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,11 @@ public static partial class PlatformDetection
public static bool IsFreeBSD => RuntimeInformation.IsOSPlatform(OSPlatform.Create("FREEBSD"));
public static bool IsNetBSD => RuntimeInformation.IsOSPlatform(OSPlatform.Create("NETBSD"));
public static bool IsAndroid => RuntimeInformation.IsOSPlatform(OSPlatform.Create("ANDROID"));
public static bool IsAndroidAOT => IsAndroid && IsMonoAOT;
public static bool IsNotAndroidAOT => !IsAndroidAOT;
public static bool IsiOS => RuntimeInformation.IsOSPlatform(OSPlatform.Create("IOS"));
public static bool IstvOS => RuntimeInformation.IsOSPlatform(OSPlatform.Create("TVOS"));
public static bool IsNotDeviceAOT => !((IsAndroid || IsiOS || IstvOS) && IsMonoAOT);
public static bool IsMacCatalyst => RuntimeInformation.IsOSPlatform(OSPlatform.Create("MACCATALYST"));
public static bool Isillumos => RuntimeInformation.IsOSPlatform(OSPlatform.Create("ILLUMOS"));
public static bool IsSolaris => RuntimeInformation.IsOSPlatform(OSPlatform.Create("SOLARIS"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

namespace Microsoft.Extensions.Configuration.FileExtensions.Test
{
[ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotDeviceAOT))]
public class FileConfigurationProviderTest
{
[Fact]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// 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.Collections.Generic;
using System.IO;
using System.Text;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using FluentAssertions;
using System;
using System.IO;
using System.Reflection;
using Xunit;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using FluentAssertions;
using System;
using System.IO;
using System.Linq;
using Xunit;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public void GetDirectoryContents_ReturnsNonExistingEmptySequence_IfResourcesDoNo
Assert.Empty(files);
}

[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotDeviceAOT))]
public void GetDirectoryContents_ReturnsCombinaisionOFFiles()
{
// Arrange
Expand Down Expand Up @@ -121,7 +121,7 @@ public void GetDirectoryContents_ReturnsCombinaisionOFFiles()
file => Assert.Same(file3, file));
}

[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotDeviceAOT))]
public void GetDirectoryContents_ReturnsCombinaitionOFFiles_WhenSomeFileProviderRetunsNoContent()
{
// Arrange
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public void Factory_MultipleCalls_CachesHandler()
Assert.NotSame(client1, client2);
}

[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotDeviceAOT))]
public void Factory_DisposeClient_DoesNotDisposeHandler()
{
// Arrange
Expand All @@ -107,7 +107,7 @@ public void Factory_DisposeClient_DoesNotDisposeHandler()
// Assert (does not throw)
}

[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotDeviceAOT))]
public void Factory_DisposeHandler_DoesNotDisposeInnerHandler()
{
// Arrange
Expand Down Expand Up @@ -170,7 +170,7 @@ public void Factory_CreateClient_WithName_UsesNamedOptions()
Assert.Equal(1, count);
}

[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotDeviceAOT))]
public void Factory_CreateClient_FiltersCanDecorateBuilder()
{
// Arrange
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public void Ctor_SetsPrimaryHandler()
}


[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotDeviceAOT))]
public void Build_NoAdditionalHandlers_ReturnsPrimaryHandler()
{
// Arrange
Expand All @@ -48,7 +48,7 @@ public void Build_NoAdditionalHandlers_ReturnsPrimaryHandler()
Assert.Same(builder.PrimaryHandler, handler);
}

[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotDeviceAOT))]
public void Build_SomeAdditionalHandlers_PutsTogetherDelegatingHandlers()
{
// Arrange
Expand Down
Loading