diff --git a/eng/pipelines/runtime-staging.yml b/eng/pipelines/runtime-staging.yml index 8bd61ad8479c2e..5235da8bd0b7c1 100644 --- a/eng/pipelines/runtime-staging.yml +++ b/eng/pipelines/runtime-staging.yml @@ -381,15 +381,12 @@ jobs: eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), eq(variables['isFullMatrix'], true)) - # Test execution is temporarily disabled because test apps no longer launch - # and the test suite times out after two hours, even if xharness cannot - # successfully launch any tests. Re-enable once these issues have been fixed. - # - # extra steps, run tests - # extraStepsTemplate: /eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml - # extraStepsParameters: - # creator: dotnet-bot - # testRunNamePrefixSuffix: Mono_$(_BuildConfig) + ${{ if 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/tests/Common/CLRTest.Execute.Bash.targets b/src/tests/Common/CLRTest.Execute.Bash.targets index 56bbda30e3e514..88732593734707 100644 --- a/src/tests/Common/CLRTest.Execute.Bash.targets +++ b/src/tests/Common/CLRTest.Execute.Bash.targets @@ -416,12 +416,7 @@ else HARNESS_RUNNER="xharness" fi -xcode_path="%24(dirname "%24(dirname "%24(xcode-select -p)")")" -simulator_app="$xcode_path/Contents/Developer/Applications/Simulator.app" -open -a "$simulator_app" -helix_runner_uid="%24(id -u)" - -sudo launchctl asuser "$helix_runner_uid" $__Command $HARNESS_RUNNER apple just-run %5c +$__Command $HARNESS_RUNNER apple just-run %5c --app="net.dot.$__Category" %5c --output-directory="$__OutputDir" %5c --set-env="MONO_APPLE_APP_ENTRY_POINT_LIB_NAME=testdir-$(MsBuildProjectName)/$(MsBuildProjectName).dll" %5c diff --git a/src/tests/Common/helixpublishwitharcade.proj b/src/tests/Common/helixpublishwitharcade.proj index af84184489ff36..2b711ba5b1a394 100644 --- a/src/tests/Common/helixpublishwitharcade.proj +++ b/src/tests/Common/helixpublishwitharcade.proj @@ -237,7 +237,12 @@ - + + false + true + + + @@ -325,11 +330,6 @@ @(HelixPostCommand) - - false - true - - $Env:CORE_ROOT\xunit\xunit.console.dll %CORE_ROOT%\xunit\xunit.console.dll @@ -368,6 +368,14 @@ dotnet $(XUnitRunnerDll) %(XUnitWrapperDlls) $(XUnitRunnerArgs) dotnet $(XUnitRunnerDll) %(XUnitWrapperDlls) $(XUnitRunnerArgs) -trait TestGroup=%(TestGroup) + + + ios-simulator-64 + ios-simulator-64 + $([System.TimeSpan]::FromMinutes($(TimeoutPerTestCollectionInMinutes))) + dotnet $(XUnitRunnerDll) %(XUnitWrapperDlls) $(XUnitRunnerArgs) + dotnet $(XUnitRunnerDll) %(XUnitWrapperDlls) $(XUnitRunnerArgs) -trait TestGroup=%(TestGroup) + $(PayloadsRootDirectory)paltests.tar.gz diff --git a/src/tests/Common/testgrouping.proj b/src/tests/Common/testgrouping.proj index 467bc2d4cac1c6..bd6da5968c054e 100644 --- a/src/tests/Common/testgrouping.proj +++ b/src/tests/Common/testgrouping.proj @@ -89,6 +89,16 @@ $(TestBinDir)JIT\Regression\JIT.Regression.XUnitWrapper.dll + + JIT.Regression.JitBlue + $(TestBinDir)JIT\Regression\JIT.Regression.XUnitWrapper.dll + + + + JIT.HardwareIntrinsics.S + $(TestBinDir)JIT\HardwareIntrinsics\JIT.HardwareIntrinsics.XUnitWrapper.dll + + Loader.classloader.generics $(TestBinDir)Loader\classloader\Loader.classloader.XUnitWrapper.dll @@ -158,13 +168,15 @@ - JIT + JIT.1 + + + JIT.2 diff --git a/src/tests/issues.targets b/src/tests/issues.targets index 53efa7f4d72de2..7fec1cd073c2df 100644 --- a/src/tests/issues.targets +++ b/src/tests/issues.targets @@ -3191,5 +3191,48 @@ Could not load file or assembly 'System.Drawing.Common, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51' or one of its dependencies. + + + needs triage + + + needs triage + + + needs triage + + + needs triage + + + needs triage + + + needs triage + + + needs triage + + + needs triage + + + needs triage + + + missing assembly + + + missing assembly + + + missing assembly + + + missing assembly + + + missing assembly +