Fix Apple mobile tests failures in extra-platforms pipeline#124000
Fix Apple mobile tests failures in extra-platforms pipeline#124000kotlarmilos wants to merge 7 commits intodotnet:mainfrom
Conversation
There was a problem hiding this comment.
Pull request overview
This PR fixes a broken target dependency in the Apple mobile jobs that was introduced by PR #123110. That PR removed the PrepareMergedTestPayloadDirectories target and inlined its content into the PreparePayloadDirectories target, but left a reference to the old target name in the ZipMergedPayloadDirectory target.
Changes:
- Updated
ZipMergedPayloadDirectorytarget'sAfterTargetsdependency from the removedPrepareMergedTestPayloadDirectoriesto the existingPreparePayloadDirectoriestarget
|
/azp run runtime-extra-platforms |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run runtime-extra-platforms |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run runtime-extra-platforms |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run runtime-extra-platforms |
|
Azure Pipelines successfully started running 1 pipeline(s). |
| <PropertyGroup> | ||
| <_MergedWrapperDirectory>%(_MergedWrapperMarker.RootDir)%(Directory)</_MergedWrapperDirectory> | ||
| <_MergedWrapperName>%(_MergedWrapperMarker.FileName)</_MergedWrapperName> | ||
| <_MergedWrapperName>$([System.Text.RegularExpressions.Regex]::Replace('%(_MergedWrapperMarker.FileName)', '\.MergedTestAssembly(ForStress)?(\.\d+\.\d+)?$', ''))</_MergedWrapperName> |
There was a problem hiding this comment.
The regex pattern here should also handle StandaloneTestRunner markers to be consistent with lines 503 and 545. Since line 272 adds StandaloneTestRunner markers for all mobile targets (including Android), this Android-specific target should use the same pattern as the Apple mobile targets. The pattern should be: '.(MergedTestAssembly(ForStress)?(.\d+.\d+)?|StandaloneTestRunner)$'
| <_MergedWrapperName>$([System.Text.RegularExpressions.Regex]::Replace('%(_MergedWrapperMarker.FileName)', '\.MergedTestAssembly(ForStress)?(\.\d+\.\d+)?$', ''))</_MergedWrapperName> | |
| <_MergedWrapperName>$([System.Text.RegularExpressions.Regex]::Replace('%(_MergedWrapperMarker.FileName)', '\.(MergedTestAssembly(ForStress)?(\.\d+\.\d+)?|StandaloneTestRunner)$', ''))</_MergedWrapperName> |
|
/azp run runtime-extra-platforms |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Description
This PR fixes several failures encountered in extra-platforms pipeline.
First, it updates
ZipMergedPayloadDirectorytarget to use `PreparePayloadDirectories, which was inlined in #123110. This should fix runtime tests on Apple mobile.Second, there is a new failure building Native AOT tests for mobile. When generating arm64 relocations for page offsets, the NativeAOT compiler was embedding addend values directly into the instruction immediate field, but the addend value was already added into the instruction bytes. This PR changes the compiler to read the value embedded in the instruction and add that value to the reloc parameter.
Third, CoreCLR tests fail to load R2R image on tvOS only. This PR probes multi-threaded load issue by adding a mutex