diff --git a/eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml b/eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml index c45d9f2f5d37b..f42787af8ebd2 100644 --- a/eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml +++ b/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) diff --git a/eng/pipelines/runtime-staging.yml b/eng/pipelines/runtime-staging.yml index eaaa9e08fe2c5..5def476efefd6 100644 --- a/eng/pipelines/runtime-staging.yml +++ b/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 diff --git a/src/mono/sample/Android/Makefile b/src/mono/sample/Android/Makefile index 11f1c35df9fb4..6d59ee860fe8b 100644 --- a/src/mono/sample/Android/Makefile +++ b/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)"' \ diff --git a/src/tests/Common/testenvironment.proj b/src/tests/Common/testenvironment.proj index 4dc72fdf06d1c..37392b57df478 100644 --- a/src/tests/Common/testenvironment.proj +++ b/src/tests/Common/testenvironment.proj @@ -193,7 +193,7 @@ <_TestEnvFileLine Include="@(_COMPlusVariable->'set %(Identity)=%(Value)')" /> - <_TestEnvFileLine Include="set MONO_ENV_OPTIONS=--interpreter" Condition="'$(Scenario)' == 'interpreter'" /> + <_TestEnvFileLine Condition="'$(RuntimeVariant)' == 'monointerpreter'" Include="set MONO_ENV_OPTIONS=--interpreter" /> <_TestEnvFileLine Condition="'$(Scenario)' == 'clrinterpreter'" Include="set COMPlus_Interpret=%2A" /> @@ -208,7 +208,7 @@ <_TestEnvFileLine Include="@(_COMPlusVariable->'export %(Identity)=%(Value)')" /> - <_TestEnvFileLine Include="export MONO_ENV_OPTIONS=--interpreter" Condition="'$(Scenario)' == 'interpreter'" /> + <_TestEnvFileLine Condition="'$(RuntimeVariant)' == 'monointerpreter'" Include="export MONO_ENV_OPTIONS=--interpreter" /> <_TestEnvFileLine Condition="'$(RuntimeVariant)' == 'llvmaot'" Include="export MONO_ENV_OPTIONS=--llvm" /> diff --git a/src/tests/issues.targets b/src/tests/issues.targets index 552b8b6400ffc..a7dff541a1a64 100644 --- a/src/tests/issues.targets +++ b/src/tests/issues.targets @@ -1688,22 +1688,22 @@ needs triage - needs triage + https://github.com/dotnet/runtime/issues/54395 needs triage - needs triage + https://github.com/dotnet/runtime/issues/54396 - needs triage + https://github.com/dotnet/runtime/issues/54374 - needs triage + https://github.com/dotnet/runtime/issues/54381 - needs triage + https://github.com/dotnet/runtime/issues/54374 needs triage @@ -1721,7 +1721,7 @@ needs triage - needs triage + https://github.com/dotnet/runtime/issues/54394 needs triage @@ -1730,16 +1730,16 @@ needs triage - needs triage + https://github.com/dotnet/runtime/issues/54371 needs triage - needs triage + https://github.com/dotnet/runtime/issues/54381 - needs triage + https://github.com/dotnet/runtime/issues/54381 needs triage @@ -1751,13 +1751,13 @@ needs triage - needs triage + https://github.com/dotnet/runtime/issues/54381 - needs triage + https://github.com/dotnet/runtime/issues/54372 - needs triage + https://github.com/dotnet/runtime/issues/54381 needs triage @@ -1769,7 +1769,7 @@ needs triage - needs triage + https://github.com/dotnet/runtime/issues/54372 needs triage @@ -1778,25 +1778,25 @@ needs triage - needs triage + https://github.com/dotnet/runtime/issues/54381 - needs triage + https://github.com/dotnet/runtime/issues/54381 - needs triage + https://github.com/dotnet/runtime/issues/54371 - needs triage + https://github.com/dotnet/runtime/issues/54381 - needs triage + https://github.com/dotnet/runtime/issues/54381 - needs triage + https://github.com/dotnet/runtime/issues/54371 - needs triage + https://github.com/dotnet/runtime/issues/54372 needs triage @@ -1808,19 +1808,19 @@ needs triage - needs triage + https://github.com/dotnet/runtime/issues/54381 needs triage - needs triage + https://github.com/dotnet/runtime/issues/54374 - needs triage + https://github.com/dotnet/runtime/issues/54381 - needs triage + https://github.com/dotnet/runtime/issues/54391 needs triage @@ -1832,10 +1832,10 @@ needs triage - needs triage + https://github.com/dotnet/runtime/issues/54391 - needs triage + https://github.com/dotnet/runtime/issues/54391 needs triage @@ -1862,7 +1862,7 @@ needs triage - needs triage + https://github.com/dotnet/runtime/issues/54381 needs triage @@ -1910,13 +1910,13 @@ needs triage - needs triage + https://github.com/dotnet/runtime/issues/54392 - needs triage + https://github.com/dotnet/runtime/issues/54388 - needs triage + https://github.com/dotnet/runtime/issues/54393 needs triage @@ -1928,7 +1928,7 @@ needs triage - needs triage + https://github.com/dotnet/runtime/issues/54393 needs triage @@ -1937,10 +1937,10 @@ needs triage - needs triage + https://github.com/dotnet/runtime/issues/54393 - needs triage + https://github.com/dotnet/runtime/issues/54388 needs triage @@ -1955,13 +1955,13 @@ needs triage - needs triage + https://github.com/dotnet/runtime/issues/54392 - needs triage + https://github.com/dotnet/runtime/issues/54393 - needs triage + https://github.com/dotnet/runtime/issues/54359 needs triage @@ -1976,16 +1976,16 @@ needs triage - needs triage + https://github.com/dotnet/runtime/issues/54392 needs triage - needs triage + https://github.com/dotnet/runtime/issues/54375 - needs triage + https://github.com/dotnet/runtime/issues/54374 needs triage @@ -2020,17 +2020,11 @@ needs triage - - needs triage - needs triage - - needs triage - - needs triage + https://github.com/dotnet/runtime/issues/54388 needs triage @@ -2038,17 +2032,11 @@ needs triage - - needs triage - - needs triage + https://github.com/dotnet/runtime/issues/54388 - needs triage - - - needs triage + https://github.com/dotnet/runtime/issues/54388 needs triage @@ -2096,10 +2084,7 @@ needs triage - needs triage - - - needs triage + https://github.com/dotnet/runtime/issues/54393 needs triage @@ -2107,14 +2092,8 @@ needs triage - - needs triage - - - needs triage - - needs triage + https://github.com/dotnet/runtime/issues/54359 needs triage @@ -2128,98 +2107,86 @@ needs triage - - needs triage - needs triage - - needs triage - - - needs triage - - needs triage + https://github.com/dotnet/runtime/issues/54399 needs triage - needs triage + https://github.com/dotnet/runtime/issues/54359 - needs triage + https://github.com/dotnet/runtime/issues/54359 - needs triage + https://github.com/dotnet/runtime/issues/54376 - needs triage + https://github.com/dotnet/runtime/issues/54359 - needs triage + https://github.com/dotnet/runtime/issues/54393 - needs triage + https://github.com/dotnet/runtime/issues/54373 needs triage - needs triage + https://github.com/dotnet/runtime/issues/54373 - needs triage + https://github.com/dotnet/runtime/issues/54393 - needs triage + https://github.com/dotnet/runtime/issues/54401 - needs triage + https://github.com/dotnet/runtime/issues/54401 - needs triage + https://github.com/dotnet/runtime/issues/54392 - needs triage + https://github.com/dotnet/runtime/issues/54376 - needs triage + https://github.com/dotnet/runtime/issues/54392 - needs triage + https://github.com/dotnet/runtime/issues/54399 needs triage - needs triage + https://github.com/dotnet/runtime/issues/54376 - needs triage + https://github.com/dotnet/runtime/issues/54392 needs triage - needs triage - - - needs triage + https://github.com/dotnet/runtime/issues/54376 - needs triage + https://github.com/dotnet/runtime/issues/54376 - needs triage + https://github.com/dotnet/runtime/issues/54376 - needs triage + https://github.com/dotnet/runtime/issues/54376 - needs triage + https://github.com/dotnet/runtime/issues/54376 needs triage @@ -2228,19 +2195,25 @@ needs triage - needs triage + https://github.com/dotnet/runtime/issues/54358 needs triage - needs triage + https://github.com/dotnet/runtime/issues/54389 - needs triage + https://github.com/dotnet/runtime/issues/54389 - needs triage + https://github.com/dotnet/runtime/issues/54376 + + + https://github.com/dotnet/runtime/issues/54374e + + + https://github.com/dotnet/runtime/issues/54374 diff --git a/src/tests/run.proj b/src/tests/run.proj index c16a18fe9f362..a64233555d206 100644 --- a/src/tests/run.proj +++ b/src/tests/run.proj @@ -648,6 +648,8 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). armeabi-v7a x86_64 x86 + false + true @@ -683,14 +685,16 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). ProjectName="$(Category)" MonoRuntimeHeaders="$(MicrosoftNetCoreAppRuntimePackDir)/native/include/mono-2.0" StripDebugSymbols="$(StripDebugSymbols)" + ForceInterpreter="$(MonoInterp)" AppDir="$(BuildDir)" OutputDir="$(AppDir)"> - - + + +