Skip to content

Fix Apple mobile tests failures in extra-platforms pipeline#124000

Open
kotlarmilos wants to merge 7 commits intodotnet:mainfrom
kotlarmilos:bugfix/merged-payload-path
Open

Fix Apple mobile tests failures in extra-platforms pipeline#124000
kotlarmilos wants to merge 7 commits intodotnet:mainfrom
kotlarmilos:bugfix/merged-payload-path

Conversation

@kotlarmilos
Copy link
Member

@kotlarmilos kotlarmilos commented Feb 4, 2026

Description

This PR fixes several failures encountered in extra-platforms pipeline.

First, it updates ZipMergedPayloadDirectory target 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

Copilot AI review requested due to automatic review settings February 4, 2026 11:53
@github-actions github-actions bot added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label Feb 4, 2026
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 ZipMergedPayloadDirectory target's AfterTargets dependency from the removed PrepareMergedTestPayloadDirectories to the existing PreparePayloadDirectories target

@kotlarmilos
Copy link
Member Author

/azp run runtime-extra-platforms

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@kotlarmilos kotlarmilos changed the title Fix target dependency for Apple mobile jobs Fix Apple mobile tests failures in extra-platforms pipeline Feb 4, 2026
@kotlarmilos
Copy link
Member Author

/azp run runtime-extra-platforms

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copilot AI review requested due to automatic review settings February 5, 2026 12:19
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.

@kotlarmilos
Copy link
Member Author

/azp run runtime-extra-platforms

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@kotlarmilos
Copy link
Member Author

/azp run runtime-extra-platforms

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copilot AI review requested due to automatic review settings February 6, 2026 13:07
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

<PropertyGroup>
<_MergedWrapperDirectory>%(_MergedWrapperMarker.RootDir)%(Directory)</_MergedWrapperDirectory>
<_MergedWrapperName>%(_MergedWrapperMarker.FileName)</_MergedWrapperName>
<_MergedWrapperName>$([System.Text.RegularExpressions.Regex]::Replace('%(_MergedWrapperMarker.FileName)', '\.MergedTestAssembly(ForStress)?(\.\d+\.\d+)?$', ''))</_MergedWrapperName>
Copy link

Copilot AI Feb 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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)$'

Suggested change
<_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>

Copilot uses AI. Check for mistakes.
@kotlarmilos
Copy link
Member Author

/azp run runtime-extra-platforms

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant