[Mono] Enable runtime tests to run on Android x64 with interpreter

eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml

@@ -26,7 +26,7 @@ parameters:
 
 
 steps:
- - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) /p:LibrariesConfiguration=${{ parameters.buildConfig }} -ci -excludemonofailures os ${{ parameters.osGroup }} ${{ parameters.archType }} $(buildConfigUpper)
+ - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) /p:LibrariesConfiguration=${{ parameters.buildConfig }} -ci -excludemonofailures os ${{ parameters.osGroup }} ${{ parameters.archType }} /p:RuntimeVariant=${{ parameters.runtimeVariant }} $(buildConfigUpper)
  displayName: Build Tests
 
  # Send tests to Helix
@@ -40,6 +40,7 @@ steps:
  coreClrRepoRoot: $(Build.SourcesDirectory)/src/coreclr
  runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }}
  shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
+ runtimeVariant: ${{ parameters.runtimeVariant }}
 
  ${{ if eq(variables['System.TeamProject'], 'public') }}:
  creator: $(Build.DefinitionName)

eng/pipelines/runtime-staging.yml

@@ -298,6 +298,44 @@ jobs:
  eq(variables['monoContainsChange'], true),
  eq(variables['isFullMatrix'], true))
 
+#
+# Build the whole product using Mono for Android and run runtime tests with interpreter
+#
+- template: /eng/pipelines/common/platform-matrix.yml
+ parameters:
+ jobTemplate: /eng/pipelines/common/global-build-job.yml
+ helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
+ buildConfig: Release
+ runtimeFlavor: mono
+ platforms:
+ - Android_x64
+ variables:
+ - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
+ - name: _HelixSource
+ value: pr/dotnet/runtime/$(Build.SourceBranch)
+ - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
+ - name: _HelixSource
+ value: ci/dotnet/runtime/$(Build.SourceBranch)
+ - name: timeoutPerTestInMinutes
+ value: 60
+ - name: timeoutPerTestCollectionInMinutes
+ value: 180
+ jobParameters:
+ testGroup: innerloop
+ nameSuffix: AllSubsets_Mono_RuntimeTests
+ buildArgs: -s mono+libs -c $(_BuildConfig)
+ timeoutInMinutes: 240
+ runtimeVariant: monointerpreter
+ condition: >-
+ or(
+ eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
+ eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
+ eq(variables['isFullMatrix'], true))
+ # extra steps, run tests
+ extraStepsTemplate: /eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml
+ extraStepsParameters:
+ creator: dotnet-bot
+ testRunNamePrefixSuffix: Mono_$(_BuildConfig)
 
 #
 # Build the whole product using Mono for Android and run runtime tests with Android devices

src/mono/sample/Android/Makefile

@@ -3,6 +3,7 @@ MONO_ARCH?=x64
 DOTNET := ../../../../dotnet.sh
 USE_LLVM=true
 AOT=false
+INTERP=false
 DEPLOY_AND_RUN?=true
 
 #If DIAGNOSTIC_PORTS is enabled, RUNTIME_COMPONENTS must also be enabled.
@@ -26,6 +27,7 @@ run:
  /p:Configuration=$(MONO_CONFIG) \
  /p:DeployAndRun=$(DEPLOY_AND_RUN) \
  /p:ForceAOT=$(AOT) \
+ /p:MonoForceInterpreter=$(INTERP) \
  /p:UseLLVM=$(USE_LLVM) \
  /p:RunActivity=false \
  '/p:RuntimeComponents="$(RUNTIME_COMPONENTS)"' \

src/tests/Common/testenvironment.proj

@@ -193,7 +193,7 @@
  <_TestEnvFileLine Include="@(_COMPlusVariable->'set %(Identity)=%(Value)')" />
 
  <!-- Mono interpreter -->
- <_TestEnvFileLine Include="set MONO_ENV_OPTIONS=--interpreter" Condition="'$(Scenario)' == 'interpreter'" />
+ <_TestEnvFileLine Condition="'$(RuntimeVariant)' == 'monointerpreter'" Include="set MONO_ENV_OPTIONS=--interpreter" />
 
  <!-- CLR interpreter -->
  <_TestEnvFileLine Condition="'$(Scenario)' == 'clrinterpreter'" Include="set COMPlus_Interpret=%2A" /> <!-- %2A is asterisk / wildcard -->
@@ -208,7 +208,7 @@
  <_TestEnvFileLine Include="@(_COMPlusVariable->'export %(Identity)=%(Value)')" />
 
  <!-- Mono interpreter -->
- <_TestEnvFileLine Include="export MONO_ENV_OPTIONS=--interpreter" Condition="'$(Scenario)' == 'interpreter'" />
+ <_TestEnvFileLine Condition="'$(RuntimeVariant)' == 'monointerpreter'" Include="export MONO_ENV_OPTIONS=--interpreter" />
 
  <!-- Hack: Use Mono LLVM JIT when JIT-compiling the non-AOT-compiled parts of the runtime tests -->
  <_TestEnvFileLine Condition="'$(RuntimeVariant)' == 'llvmaot'" Include="export MONO_ENV_OPTIONS=--llvm" />