diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml
index cdc2b96129429a..a57e18183ea64d 100644
--- a/eng/pipelines/common/templates/runtimes/run-test-job.yml
+++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml
@@ -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.
@@ -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
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index 0a9e05f94a6cb1..2ee5255fee8c1f 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -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
diff --git a/src/coreclr/tests/helixpublishwitharcade.proj b/src/coreclr/tests/helixpublishwitharcade.proj
index 6d46021c28e838..561fc7e1af7211 100644
--- a/src/coreclr/tests/helixpublishwitharcade.proj
+++ b/src/coreclr/tests/helixpublishwitharcade.proj
@@ -197,7 +197,6 @@
R2R-CG2
$(TestRunNamePrefix)$(TargetOS) $(TargetArchitecture) $(Configuration) @
$(TestRunNamePrefix)$(TargetOS) $(TargetArchitecture) $(Configuration) $(Scenario) @
- $(TestRunNamePrefix) Interpreter
$([System.TimeSpan]::FromMinutes($(TimeoutPerTestInMinutes)).TotalMilliseconds)
true
<_XUnitParallelMode>collections
@@ -224,7 +223,6 @@
-
@@ -244,7 +242,6 @@
-
diff --git a/src/coreclr/tests/issues.targets b/src/coreclr/tests/issues.targets
index 16851f03a2797b..a29dda03c8ec6d 100644
--- a/src/coreclr/tests/issues.targets
+++ b/src/coreclr/tests/issues.targets
@@ -1558,7 +1558,6 @@
needs triage
- needs triage
needs triage
@@ -1871,6 +1870,577 @@
needs triage
+
+
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
+ needs triage
+
+
@@ -2057,5 +2627,11 @@
needs triage
+
+
+
+ needs triage
+
+
diff --git a/src/coreclr/tests/testenvironment.proj b/src/coreclr/tests/testenvironment.proj
index caed6ae7e1ee8c..6bb7dda56ddbbe 100644
--- a/src/coreclr/tests/testenvironment.proj
+++ b/src/coreclr/tests/testenvironment.proj
@@ -174,11 +174,13 @@
<_TestEnvFileLine Include="@(_COMPlusVariable->'set %(Identity)=%(Value)')" />
+ <_TestEnvFileLine Include="set MONO_ENV_OPTIONS=--interpreter" Condition="'$(Scenario)' == 'interpreter'" />
<_TestEnvFileLine Include="#!/usr/bin/env bash" />
<_TestEnvFileLine Include="@(_COMPlusVariable->'export %(Identity)=%(Value)')" />
+ <_TestEnvFileLine Include="export MONO_ENV_OPTIONS=--interpreter" Condition="'$(Scenario)' == 'interpreter'" />