Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[mono]Re-enable runtime tests on Android arm64 #49662

Merged
merged 14 commits into from
Jun 22, 2021
Merged

[mono]Re-enable runtime tests on Android arm64 #49662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8b72fc7
Re-enable runtime tests on Android arm64
fanyang-mono Mar 15, 2021
43a1c94
disable irrelevant CI lanes
fanyang-mono May 4, 2021
105e4e4
Disable more dotnet-linker-tests and runtime-dev-innerloop CI lanes
fanyang-mono May 4, 2021
8aadfbc
Comment out definition for DISABLE_LOGGING
fanyang-mono May 8, 2021
b9a45d4
Remove defining logging for android
fanyang-mono May 11, 2021
65cfd5f
Extend app installation timeout limit
fanyang-mono Jun 17, 2021
47fba8f
Fix command prefix for windows
fanyang-mono Jun 17, 2021
fffc452
Enable tests excluded only for Android arm64
fanyang-mono Jun 18, 2021
1b3110d
Disable failed test on arm64
fanyang-mono Jun 18, 2021
98abcff
Revert hacks
fanyang-mono Jun 18, 2021
0cff9a9
Revert unintended changes
fanyang-mono Jun 18, 2021
50f2933
More...
fanyang-mono Jun 18, 2021
160850a
Only run tests on arm64 for rolling build
fanyang-mono Jun 21, 2021
51a6754
Fix merge error
fanyang-mono Jun 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions eng/pipelines/runtime-staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ jobs:
buildConfig: Release
runtimeFlavor: mono
platforms:
#- Android_arm64 # disabled due to https://github.com/dotnet/runtime/issues/47850
- Android_arm64
variables:
- ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
- name: _HelixSource
Expand All @@ -369,11 +369,13 @@ jobs:
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)
# don't run tests on PRs until we can get significantly more devices
${{ 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)

# Run disabled installer tests on Linux x64
- template: /eng/pipelines/common/platform-matrix.yml
Expand Down
16 changes: 13 additions & 3 deletions src/tests/Common/Coreclr.TestWrapper/MobileAppHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ private static void HandleMobileApp(string action, string platform, string categ
string xharnessCmd;
string cmdStr;
string appExtension;
int timeout = 240000; // Set timeout to 4 mins, because the installation on Android arm64/32 devices could take up to 4 mins on CI
int timeout = 600000; // Set timeout to 4 mins, because the installation on Android arm64/32 devices could take up to 10 mins on CI

if(String.IsNullOrEmpty(dotnetCmd_raw))
{
Expand Down Expand Up @@ -120,8 +120,18 @@ private static void HandleMobileApp(string action, string platform, string categ
private static string ConvertCmd2Arg(string cmd)
{
cmd.Replace("\"", "\"\"");
var result = $"-c \"{cmd}\"";
return result;

string cmdPrefix;
if(OperatingSystem.IsWindows())
{
cmdPrefix = "/c";
}
else
{
cmdPrefix = "-c";
}

return $"{cmdPrefix} \"{cmd}\"";
}
}
}
22 changes: 2 additions & 20 deletions src/tests/issues.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3155,26 +3155,8 @@
</ItemGroup>

<ItemGroup Condition=" $(TargetOS) == 'Android' And '$(TargetArchitecture)' == 'arm64' " >
<ExcludeList Include = "$(XunitTestBinBase)/JIT/HardwareIntrinsics/**">
<Issue>https://github.com/dotnet/runtime/issues/45568 (workitem JIT.HardwareIntrinsics)</Issue>
</ExcludeList>
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Methodical/**">
<Issue>https://github.com/dotnet/runtime/issues/45568 (workitem JIT.Methodical*)</Issue>
</ExcludeList>
<ExcludeList Include = "$(XunitTestBinBase)/JIT/IL_Conformance/**">
<Issue>https://github.com/dotnet/runtime/issues/45568 (workitem JIT.IL_Conformance)</Issue>
</ExcludeList>
<ExcludeList Include = "$(XunitTestBinBase)/JIT/SIMD/**">
<Issue>https://github.com/dotnet/runtime/issues/45568 (workitem JIT)</Issue>
</ExcludeList>
<ExcludeList Include = "$(XunitTestBinBase)/JIT/opt/**">
<Issue>https://github.com/dotnet/runtime/issues/45568 (workitem JIT)</Issue>
</ExcludeList>
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/**">
<Issue>https://github.com/dotnet/runtime/issues/45568 (workitem JIT.Regression.CLR-x86-JIT.V1-M12-M13)</Issue>
</ExcludeList>
<ExcludeList Include = "$(XunitTestBinBase)/GC/Scenarios/**">
<Issue>https://github.com/dotnet/runtime/issues/45568 (workitem PayloadGroup0)</Issue>
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Performance/CodeQuality/BenchmarksGame/fannkuch-redux/fannkuch-redux-5/**">
<Issue>https://github.com/dotnet/runtime/issues/52781</Issue>
</ExcludeList>
</ItemGroup>
</Project>