@@ -9,6 +9,7 @@ parameters:
99 crossBuild : false
1010 crossrootfsDir : ' '
1111 dependOnEvaluatePaths : false
12+ disableClrTest : false
1213 isOfficialBuild : false
1314 osGroup : ' '
1415 osSubgroup : ' '
3839 pool : ${{ parameters.pool }}
3940 condition : ${{ parameters.condition }}
4041 dependOnEvaluatePaths : ${{ parameters.dependOnEvaluatePaths }}
42+ disableClrTest : ${{ parameters.disableClrTest }}
4143 pgoType : ${{ parameters.pgoType }}
4244
4345 # Compute job name from template parameters
@@ -141,6 +143,12 @@ jobs:
141143 - name : SignType
142144 value : $[ coalesce(variables.OfficialSignType, 'real') ]
143145
146+ - name : clrRuntimePortableBuildArg
147+ value : ' '
148+ - ${{ if eq(parameters.archType, 'armel' )}} :
149+ - name : clrRuntimePortableBuildArg
150+ value : ' -portablebuild=false'
151+
144152 - ${{ parameters.variables }}
145153
146154 steps :
@@ -188,7 +196,7 @@ jobs:
188196
189197 # Build CoreCLR Runtime
190198 - ${{ if ne(parameters.osGroup, 'windows') }} :
191- - script : $(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) $(crossArg) $(osArg) -ci $(compilerArg) $(clrBuildPALTestsBuildArg) $(pgoInstrumentArg) $(officialBuildIdArg) $(clrInterpreterBuildArg)
199+ - script : $(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) $(crossArg) $(osArg) -ci $(compilerArg) $(clrBuildPALTestsBuildArg) $(pgoInstrumentArg) $(officialBuildIdArg) $(clrInterpreterBuildArg) $(clrRuntimePortableBuildArg)
192200 displayName : Build CoreCLR Runtime
193201 - ${{ if eq(parameters.osGroup, 'windows') }} :
194202 - script : set __TestIntermediateDir=int&&$(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci $(enforcePgoArg) $(pgoInstrumentArg) $(officialBuildIdArg) $(clrInterpreterBuildArg)
@@ -210,7 +218,7 @@ jobs:
210218 displayName : Run CoreCLR Tools unit tests
211219
212220 # Build native test components
213- - ${{ if ne(parameters.isOfficialBuild, true) }} :
221+ - ${{ if and( ne(parameters.isOfficialBuild, true), ne(parameters.disableClrTest, true) ) }} :
214222 - script : $(Build.SourcesDirectory)/src/tests/build$(scriptExt) skipmanaged skipgeneratelayout $(buildConfig) $(archType) $(crossArg) $(osArg) $(priorityArg) $(compilerArg)
215223 displayName : Build native test components
216224
@@ -257,7 +265,7 @@ jobs:
257265 condition : always()
258266
259267 # Builds using gcc are not tested, and clrTools unitests do not publish the build artifacts
260- - ${{ if and(ne(parameters.compilerName, 'gcc'), ne(parameters.testGroup, 'clrTools')) }} :
268+ - ${{ if and(ne(parameters.compilerName, 'gcc'), ne(parameters.testGroup, 'clrTools'), ne(parameters.disableClrTest, true) ) }} :
261269 # Publish product output directory for consumption by tests.
262270 - template : /eng/pipelines/common/upload-artifact-step.yml
263271 parameters :
@@ -276,7 +284,7 @@ jobs:
276284 osGroup : ${{ parameters.osGroup }}
277285 osSubgroup : ${{ parameters.osSubgroup }}
278286
279- - ${{ if and(ne(parameters.compilerName, 'gcc'), ne(parameters.testGroup, ''), ne(parameters.testGroup, 'clrTools')) }} :
287+ - ${{ if and(ne(parameters.compilerName, 'gcc'), ne(parameters.testGroup, ''), ne(parameters.testGroup, 'clrTools'), ne(parameters.disableClrTest, true) ) }} :
280288 # Publish test native components for consumption by test execution.
281289 - ${{ if and(ne(parameters.isOfficialBuild, true), eq(parameters.pgoType, '')) }} :
282290 - template : /eng/pipelines/common/upload-artifact-step.yml
0 commit comments