Skip to content

Commit ce63557

Browse files
Stop building AppHost in native AOT testing (#101270)
Fixes #79575.
1 parent a3bf7d4 commit ce63557

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ extends:
6969
testGroup: innerloop
7070
isSingleFile: true
7171
nameSuffix: NativeAOT_Libs
72-
buildArgs: -s clr.aot+host.native+libs+libs.tests -c $(_BuildConfig) /p:TestNativeAot=true /p:ArchiveTests=true /p:IlcUseServerGc=false /p:RunAnalyzers=false
72+
buildArgs: -s clr.aot+libs+libs.tests -c $(_BuildConfig) /p:TestNativeAot=true /p:ArchiveTests=true /p:IlcUseServerGc=false /p:RunAnalyzers=false
7373
timeoutInMinutes: 300 # doesn't normally take this long, but I've seen Helix queues backed up for 160 minutes
7474
includeAllPlatforms: true
7575
# extra steps, run tests
@@ -95,7 +95,7 @@ extends:
9595
testGroup: innerloop
9696
isSingleFile: true
9797
nameSuffix: NativeAOT_Checked_Libs
98-
buildArgs: -s clr.aot+host.native+libs+libs.tests -c $(_BuildConfig) -rc Checked /p:TestNativeAot=true /p:ArchiveTests=true /p:IlcUseServerGc=false /p:RunAnalyzers=false
98+
buildArgs: -s clr.aot+libs+libs.tests -c $(_BuildConfig) -rc Checked /p:TestNativeAot=true /p:ArchiveTests=true /p:IlcUseServerGc=false /p:RunAnalyzers=false
9999
timeoutInMinutes: 360
100100
# extra steps, run tests
101101
postBuildSteps:
@@ -120,7 +120,7 @@ extends:
120120
testGroup: innerloop
121121
isSingleFile: true
122122
nameSuffix: NativeAOT_Checked_Libs_SizeOpt
123-
buildArgs: -s clr.aot+host.native+libs+libs.tests -c $(_BuildConfig) -rc Checked /p:TestNativeAot=true /p:ArchiveTests=true /p:OptimizationPreference=Size /p:IlcUseServerGc=false /p:RunAnalyzers=false
123+
buildArgs: -s clr.aot+libs+libs.tests -c $(_BuildConfig) -rc Checked /p:TestNativeAot=true /p:ArchiveTests=true /p:OptimizationPreference=Size /p:IlcUseServerGc=false /p:RunAnalyzers=false
124124
timeoutInMinutes: 240
125125
# extra steps, run tests
126126
postBuildSteps:
@@ -145,7 +145,7 @@ extends:
145145
testGroup: innerloop
146146
isSingleFile: true
147147
nameSuffix: NativeAOT_Checked_Libs_SpeedOpt
148-
buildArgs: -s clr.aot+host.native+libs+libs.tests -c $(_BuildConfig) -rc Checked /p:TestNativeAot=true /p:ArchiveTests=true /p:OptimizationPreference=Speed /p:IlcUseServerGc=false /p:RunAnalyzers=false
148+
buildArgs: -s clr.aot+libs+libs.tests -c $(_BuildConfig) -rc Checked /p:TestNativeAot=true /p:ArchiveTests=true /p:OptimizationPreference=Speed /p:IlcUseServerGc=false /p:RunAnalyzers=false
149149
timeoutInMinutes: 240
150150
# extra steps, run tests
151151
postBuildSteps:
@@ -176,7 +176,7 @@ extends:
176176
jobParameters:
177177
timeoutInMinutes: 300 # doesn't normally take this long, but we have had Helix queues backed up for over an hour
178178
nameSuffix: NativeAOT_Pri0
179-
buildArgs: -s clr.aot+host.native+libs -rc $(_BuildConfig) -lc Release -hc Release /p:RunAnalyzers=false
179+
buildArgs: -s clr.aot+libs -rc $(_BuildConfig) -lc Release /p:RunAnalyzers=false
180180
postBuildSteps:
181181
- template: /eng/pipelines/coreclr/nativeaot-post-build-steps.yml
182182
parameters:

eng/pipelines/runtime-sanitized.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ extends:
133133
testGroup: innerloop
134134
timeoutInMinutes: 120
135135
nameSuffix: NativeAOT
136-
buildArgs: -s clr.aot+host.native+libs -rc $(_BuildConfig) -lc Release -hc Release $(_nativeSanitizersArg)
136+
buildArgs: -s clr.aot+libs -rc $(_BuildConfig) -lc Release $(_nativeSanitizersArg)
137137
postBuildSteps:
138138
- template: /eng/pipelines/coreclr/nativeaot-post-build-steps.yml
139139
parameters:

eng/pipelines/runtime.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ extends:
567567
jobParameters:
568568
timeoutInMinutes: 120
569569
nameSuffix: NativeAOT
570-
buildArgs: -s clr.aot+host.native+libs -rc $(_BuildConfig) -lc Release -hc Release /p:RunAnalyzers=false
570+
buildArgs: -s clr.aot+libs -rc $(_BuildConfig) -lc Release /p:RunAnalyzers=false
571571
postBuildSteps:
572572
- template: /eng/pipelines/coreclr/nativeaot-post-build-steps.yml
573573
parameters:
@@ -606,7 +606,7 @@ extends:
606606
jobParameters:
607607
timeoutInMinutes: 180
608608
nameSuffix: NativeAOT
609-
buildArgs: -s clr.aot+host.native+libs.native+libs.sfx -rc $(_BuildConfig) -lc Release -hc Release /p:RunAnalyzers=false
609+
buildArgs: -s clr.aot+libs.native+libs.sfx -rc $(_BuildConfig) -lc Release /p:RunAnalyzers=false
610610
postBuildSteps:
611611
- template: /eng/pipelines/coreclr/nativeaot-post-build-steps.yml
612612
parameters:
@@ -651,7 +651,7 @@ extends:
651651
testGroup: innerloop
652652
timeoutInMinutes: 120
653653
nameSuffix: NativeAOT
654-
buildArgs: -s clr.aot+host.native+libs+tools.illink -c $(_BuildConfig) -rc $(_BuildConfig) -lc Release -hc Release /p:RunAnalyzers=false
654+
buildArgs: -s clr.aot+libs+tools.illink -c $(_BuildConfig) -rc $(_BuildConfig) -lc Release /p:RunAnalyzers=false
655655
postBuildSteps:
656656
- template: /eng/pipelines/coreclr/nativeaot-post-build-steps.yml
657657
parameters:
@@ -688,7 +688,7 @@ extends:
688688
testGroup: innerloop
689689
isSingleFile: true
690690
nameSuffix: NativeAOT_Libraries
691-
buildArgs: -s clr.aot+host.native+libs+libs.tests -c $(_BuildConfig) /p:TestNativeAot=true /p:RunSmokeTestsOnly=true /p:ArchiveTests=true /p:RunAnalyzers=false
691+
buildArgs: -s clr.aot+libs+libs.tests -c $(_BuildConfig) /p:TestNativeAot=true /p:RunSmokeTestsOnly=true /p:ArchiveTests=true /p:RunAnalyzers=false
692692
timeoutInMinutes: 240 # Doesn't actually take long, but we've seen the ARM64 Helix queue often get backlogged for 2+ hours
693693
# extra steps, run tests
694694
postBuildSteps:

eng/testing/linker/trimmingTests.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142

143143
<MSBuild Projects="@(TestConsoleApps)"
144144
Targets="Publish"
145-
Properties="Configuration=$(Configuration);BuildProjectReferences=false;TargetOS=$(TargetOS);TargetArchitecture=$(TargetArchitecture)" />
145+
Properties="Configuration=$(Configuration);BuildProjectReferences=false;TargetOS=$(TargetOS);TargetArchitecture=$(TargetArchitecture);_IsPublishing=true" />
146146
</Target>
147147

148148
<Target Name="ExecuteApplications"

0 commit comments

Comments
 (0)