Skip to content

Commit f7f0e0a

Browse files
authored
Revert "Fix up NativeAOT testing" & don't build clr.runtime for libraries AOT tests (#79637)
* Revert "Fix up NativeAOT testing (#79523)" This reverts commit b2bebcb. * Don't build clr.runtime for libraries AOT tests 866f3eb made it again possible to build the host.native subset without the clr.runtime. Previously there was a dependency on the singlefilehost which was removed when it isn't required.
1 parent 58e82be commit f7f0e0a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
testGroup: innerloop
9494
isSingleFile: true
9595
nameSuffix: NativeAOT_Libs
96-
buildArgs: -s clr.runtime+clr.aot+host.native+libs+libs.tests -c $(_BuildConfig) /p:TestNativeAot=true /p:ArchiveTests=true /p:UseNativeAotCoreLib=true
96+
buildArgs: -s clr.aot+host.native+libs+libs.tests -c $(_BuildConfig) /p:TestNativeAot=true /p:ArchiveTests=true
9797
timeoutInMinutes: 300 # doesn't normally take this long, but I've seen Helix queues backed up for 160 minutes
9898
# extra steps, run tests
9999
extraStepsTemplate: /eng/pipelines/libraries/helix.yml

eng/pipelines/runtime.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ extends:
203203
testGroup: innerloop
204204
timeoutInMinutes: 120
205205
nameSuffix: NativeAOT
206-
buildArgs: -s clr.runtime+clr.aot+host.native+libs -rc $(_BuildConfig) -lc Release -hc Release /p:UseNativeAotCoreLib=true
206+
buildArgs: -s clr.aot+host.native+libs -rc $(_BuildConfig) -lc Release -hc Release
207207
extraStepsTemplate: /eng/pipelines/coreclr/nativeaot-post-build-steps.yml
208208
condition: >-
209209
or(
@@ -225,7 +225,7 @@ extends:
225225
testGroup: innerloop
226226
timeoutInMinutes: 120
227227
nameSuffix: NativeAOT
228-
buildArgs: -s clr.runtime+clr.aot+host.native+libs -rc $(_BuildConfig) -lc Release -hc Release /p:UseNativeAotCoreLib=true
228+
buildArgs: -s clr.aot+host.native+libs -rc $(_BuildConfig) -lc Release -hc Release
229229
extraStepsTemplate: /eng/pipelines/coreclr/nativeaot-post-build-steps.yml
230230
condition: >-
231231
or(
@@ -249,7 +249,7 @@ extends:
249249
testGroup: innerloop
250250
timeoutInMinutes: 120
251251
nameSuffix: NativeAOT
252-
buildArgs: -s clr.runtime+clr.aot+host.native+libs -rc $(_BuildConfig) -lc Release -hc Release /p:UseNativeAotCoreLib=true
252+
buildArgs: -s clr.aot+host.native+libs -rc $(_BuildConfig) -lc Release -hc Release
253253
extraStepsTemplate: /eng/pipelines/coreclr/nativeaot-post-build-steps.yml
254254
condition: >-
255255
or(
@@ -274,7 +274,7 @@ extends:
274274
testGroup: innerloop
275275
isSingleFile: true
276276
nameSuffix: NativeAOT
277-
buildArgs: -s clr.runtime+clr.aot+host.native+libs+libs.tests -c $(_BuildConfig) /p:TestNativeAot=true /p:RunSmokeTestsOnly=true /p:ArchiveTests=true /p:UseNativeAotCoreLib=true
277+
buildArgs: -s clr.aot+host.native+libs+libs.tests -c $(_BuildConfig) /p:TestNativeAot=true /p:RunSmokeTestsOnly=true /p:ArchiveTests=true
278278
timeoutInMinutes: 240 # Doesn't actually take long, but we've seen the ARM64 Helix queue often get backlogged for 2+ hours
279279
# extra steps, run tests
280280
extraStepsTemplate: /eng/pipelines/libraries/helix.yml

0 commit comments

Comments
 (0)