Skip to content

Commit

Permalink
Naricc/ci interpreter arm64 (#36258)
Browse files Browse the repository at this point in the history
Change mono interpreter runs to be a scenario instead of a seperate leg. Also enable arm64 interpreter runs, and add test exclusions.
  • Loading branch information
Nathan Ricci authored May 17, 2020
1 parent 4700cf4 commit bacef40
Show file tree
Hide file tree
Showing 5 changed files with 583 additions and 32 deletions.
9 changes: 4 additions & 5 deletions eng/pipelines/common/templates/runtimes/run-test-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,6 @@ jobs:
- name: crossgenArg
value: 'composite'

- ${{ if eq(parameters.runtimeMode, 'interpreter') }}:
- name: RuntimeModeDisplayName
value: 'Interpreter'

# Set job timeouts
#
# "timeoutPerTestCollectionInMinutes" is the time needed for the "biggest" xUnit test collection to complete.
Expand Down Expand Up @@ -335,7 +331,10 @@ jobs:
${{ if in(parameters.testGroup, 'innerloop', 'outerloop') }}:
scenarios:
- normal
- no_tiered_compilation
- ${{ if eq(parameters.runtimeFlavor, 'coreclr') }}:
- no_tiered_compilation
- ${{ if eq(parameters.runtimeFlavor, 'mono') }}:
- interpreter
${{ if in(parameters.testGroup, 'jitstress') }}:
scenarios:
- jitminopts
Expand Down
23 changes: 0 additions & 23 deletions eng/pipelines/runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -729,29 +729,6 @@ jobs:
eq(dependencies.checkout.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(variables['isFullMatrix'], true))
#
# Mono CoreCLR runtime Test executions using live libraries
# Only when Mono is changed
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml
buildConfig: release
runtimeFlavor: mono
platforms:
- OSX_x64
helixQueueGroup: pr
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
jobParameters:
testGroup: innerloop
liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
liveRuntimeBuildConfig: release
runtimeMode: 'interpreter'
runtimeModeDisplayName: 'Interpreter'
condition: >-
or(
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(variables['isFullMatrix'], true))
#
# Libraries Release Test Execution against a release mono runtime.
# Only when libraries or mono changed
Expand Down
3 changes: 0 additions & 3 deletions src/coreclr/tests/helixpublishwitharcade.proj
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,6 @@
<TestRunNamePrefix Condition=" '$(RunCrossGen2)' == 'true' ">R2R-CG2 </TestRunNamePrefix>
<TestRunNamePrefix Condition=" '$(Scenario)' == 'normal' ">$(TestRunNamePrefix)$(TargetOS) $(TargetArchitecture) $(Configuration) @ </TestRunNamePrefix>
<TestRunNamePrefix Condition=" '$(Scenario)' != 'normal' ">$(TestRunNamePrefix)$(TargetOS) $(TargetArchitecture) $(Configuration) $(Scenario) @ </TestRunNamePrefix>
<TestRunNamePrefix Condition=" '$(RuntimeMode)' == 'interpreter' ">$(TestRunNamePrefix) Interpreter </TestRunNamePrefix>
<TimeoutPerTestInMilliseconds Condition=" '$(TimeoutPerTestInMinutes)' != '' ">$([System.TimeSpan]::FromMinutes($(TimeoutPerTestInMinutes)).TotalMilliseconds)</TimeoutPerTestInMilliseconds>
<WaitForWorkItemCompletion>true</WaitForWorkItemCompletion>
<_XUnitParallelMode>collections</_XUnitParallelMode>
Expand All @@ -224,7 +223,6 @@
<HelixPreCommand Include="set __CollectDumps=1" />
<HelixPreCommand Include="set __CrashDumpFolder=%HELIX_DUMP_FOLDER%" />
<HelixPreCommand Include="type %__TestEnv%" />
<HelixPreCommand Include="set MONO_ENV_OPTIONS='--interpreter'" Condition=" '$(RuntimeMode)' == 'interpreter' " />
</ItemGroup>

<ItemGroup Condition=" '$(TargetsWindows)' != 'true' ">
Expand All @@ -244,7 +242,6 @@
<HelixPreCommand Include="cat $__TestEnv" />
<HelixPreCommand Include="sudo bash -c 'echo $HELIX_DUMP_FOLDER/core.%u.%p > /proc/sys/kernel/core_pattern'" Condition=" '$(TargetOS)' != 'OSX' " />
<HelixPreCommand Include="ulimit -c unlimited" Condition=" '$(TargetOS)' == 'OSX' " />
<HelixPreCommand Include="export MONO_ENV_OPTIONS='--interpreter" Condition=" '$(RuntimeMode)' == 'interpreter' " />
</ItemGroup>

<PropertyGroup>
Expand Down
Loading

0 comments on commit bacef40

Please sign in to comment.