Skip to content

Commit c5200b6

Browse files
authored
Enable NativeAOT win-x86 runtime tests (#99688)
1 parent ec4437b commit c5200b6

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ extends:
5757
platforms:
5858
- windows_x64
5959
- windows_arm64
60+
- windows_x86
6061
- osx_x64
6162
- osx_arm64
6263
- linux_x64
@@ -164,6 +165,7 @@ extends:
164165
buildConfig: Checked
165166
platforms:
166167
- windows_x64
168+
- windows_x86
167169
- linux_x64
168170
- linux_arm
169171
variables:
@@ -172,7 +174,7 @@ extends:
172174
- name: timeoutPerTestCollectionInMinutes
173175
value: 180
174176
jobParameters:
175-
timeoutInMinutes: 240
177+
timeoutInMinutes: 300 # doesn't normally take this long, but we have had Helix queues backed up for over an hour
176178
nameSuffix: NativeAOT_Pri0
177179
buildArgs: -s clr.aot+host.native+libs -rc $(_BuildConfig) -lc Release -hc Release /p:RunAnalyzers=false
178180
postBuildSteps:

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@
6464
<Error Condition="'$(DisableUnsupportedError)' != 'true' and '$(OS)' != 'Windows_NT' and '$(_targetOS)' == 'win'"
6565
Text="Cross-OS native compilation is not supported." />
6666

67-
<Error Condition="'$(DisableUnsupportedError)' != 'true' and '$(_targetArchitecture)' != 'x64' and '$(_targetArchitecture)' != 'arm64' and '$(_targetArchitecture)' != 'arm'"
67+
<Error Condition="'$(DisableUnsupportedError)' != 'true' and '$(_targetArchitecture)' != 'x64' and '$(_targetArchitecture)' != 'x86' and '$(_targetArchitecture)' != 'arm64' and '$(_targetArchitecture)' != 'arm'"
6868
Text="Native compilation does not support targeting $(RuntimeIdentifier) yet." />
6969

70-
<Error Condition="'$(DisableUnsupportedError)' != 'true' and !('$(_hostArchitecture)' == 'x64' or '$(_hostArchitecture)' == 'arm64' or '$(_hostArchitecture)' == 'arm')"
71-
Text="Native compilation can run on x64, arm64 and arm hosts only." />
70+
<Error Condition="'$(DisableUnsupportedError)' != 'true' and '$(_hostArchitecture)' != 'x64' and '$(_hostArchitecture)' != 'x86' and '$(_hostArchitecture)' != 'arm64' and '$(_hostArchitecture)' != 'arm'"
71+
Text="Native compilation can run on x64, x86, arm64 and arm hosts only." />
7272

7373
<Error Condition="'$(IlcHostPackagePath)' == '' and '$(RuntimePackagePath)' != '' and ('$(_hostArchitecture)' == 'x64' or '$(_hostArchitecture)' == 'arm64')"
7474
Text="Add a PackageReference for '$(_hostPackageName)' to allow cross-compilation for $(_targetArchitecture)" />

src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/ILCompilerRIDs.props

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<OfficialBuildRID Include="osx-arm64" Platform="arm64" />
1313
<OfficialBuildRID Include="win-arm64" Platform="arm64" />
1414
<OfficialBuildRID Include="win-x64" Platform="x64" />
15+
<OfficialBuildRID Include="win-x86" Platform="x86" />
1516
<OfficialBuildRID Include="freebsd-x64" Platform="x64" />
1617
<OfficialBuildRID Include="freebsd-arm64" Platform="arm64" />
1718
<OfficialBuildRID Include="$(OutputRID)" Platform="$(TargetArchitecture)" Exclude="@(OfficialBuildRID)" />

0 commit comments

Comments
 (0)