Skip to content

Commit 550c960

Browse files
Enable async testing in CI (#121857)
With #121814 merged we should be able to start running these in the CI for native AOT.
1 parent 8566685 commit 550c960

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

eng/pipelines/coreclr/runtime-nativeaot-outerloop.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ schedules:
3737

3838
variables:
3939
- template: /eng/pipelines/common/variables.yml
40+
- template: /eng/pipelines/helix-platforms.yml
4041

4142
extends:
4243
template: /eng/pipelines/common/templates/pipeline-with-resources.yml

eng/pipelines/runtime.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ extends:
605605
- template: /eng/pipelines/coreclr/nativeaot-post-build-steps.yml
606606
parameters:
607607
creator: dotnet-bot
608-
testBuildArgs: 'nativeaot tree ";nativeaot;Loader;Interop;" /p:BuildNativeAotFrameworkObjects=true'
608+
testBuildArgs: 'nativeaot tree ";nativeaot;Loader;Interop;async;" /p:BuildNativeAotFrameworkObjects=true'
609609
liveLibrariesBuildConfig: Release
610610
testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig)
611611
extraVariablesTemplates:

src/coreclr/tools/Common/Compiler/DependencyAnalysis/MethodReadOnlyDataNode.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ public override bool ShouldSkipEmittingObjectNode(NodeFactory factory)
2626
}
2727
#endif
2828

29-
public override ObjectNodeSection GetSection(NodeFactory factory) => ObjectNodeSection.ReadOnlyDataSection;
29+
// TODO: (async) This should stay RO everywhere: https://github.com/dotnet/runtime/issues/121871
30+
public override ObjectNodeSection GetSection(NodeFactory factory)
31+
=> factory.Target.IsWindows ? ObjectNodeSection.ReadOnlyDataSection : ObjectNodeSection.DataSection;
32+
3033
public override bool StaticDependenciesAreComputed => _data != null;
3134

3235
public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)

src/tests/async/Directory.Build.targets

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
<Project>
22
<PropertyGroup>
33
<!-- disable building for configurations that do not yet support runtime async. -->
4-
<DisableProjectBuild Condition="'$(RuntimeFlavor)' == 'mono' or '$(TestBuildMode)' == 'nativeaot' or '$(TargetArchitecture)' == 'wasm'">true</DisableProjectBuild>
4+
<DisableProjectBuild Condition="'$(RuntimeFlavor)' == 'mono' or '$(TargetArchitecture)' == 'wasm'">true</DisableProjectBuild>
5+
</PropertyGroup>
6+
7+
<PropertyGroup>
8+
<!-- https://github.com/dotnet/runtime/issues/121872 -->
9+
<DisableProjectBuild Condition="'$(TestBuildMode)' == 'nativeaot' and '$(TargetArchitecture)' == 'x86'">true</DisableProjectBuild>
10+
11+
<!-- https://github.com/dotnet/runtime/issues/121878 -->
12+
<DisableProjectBuild Condition="'$(TestBuildMode)' == 'nativeaot' and '$(TargetArchitecture)' == 'arm64'">true</DisableProjectBuild>
513
</PropertyGroup>
614

715
<PropertyGroup>
816
<!-- runtime async testing in main repo NYI -->
9-
<DisableProjectBuild>true</DisableProjectBuild>
17+
<DisableProjectBuild Condition="'$(TestBuildMode)' != 'nativeaot'">true</DisableProjectBuild>
1018
</PropertyGroup>
1119

1220
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets, $(MSBuildThisFileDirectory)..))" />

0 commit comments

Comments
 (0)