Skip to content

Enable PlatformNativeR2R test on macOS #121752

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

Merged
elinor-fung merged 2 commits into from
Nov 24, 2025
Merged

Enable PlatformNativeR2R test on macOS #121752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
395a3b4
Enable PlatformNativeR2R test on macOS
elinor-fung Nov 18, 2025
11ba8b8
Update src/tests/Loader/PlatformNativeR2R/PlatformNativeR2R.csproj
elinor-fung Nov 20, 2025
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
33 changes: 28 additions & 5 deletions src/tests/Common/CLRTest.CrossGen.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
if [ ! -d IL-CG2 ]%3B then
mkdir IL-CG2
cp ./*.dll IL-CG2/
rm IL-CG2/composite-r2r.dll 2>/dev/null
rm IL-CG2/composite-r2r.* 2>/dev/null
rm IL-CG2/Coreclr.TestWrapper.dll 2>/dev/null
rm IL-CG2/*.XUnitWrapper.dll 2>/dev/null

Expand All @@ -85,6 +85,7 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
RunCrossgen2OnFiles() {
date +%H:%M:%S
__OutputFile=$1
__OutputFileFinal=$2

__ResponseFile="$__OutputFile.rsp"
rm "$__ResponseFile" 2>/dev/null
Expand All @@ -97,14 +98,17 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
__R2RDumpCommand+=" dotnet"
fi
__R2RDumpCommand+=" $CORE_ROOT/R2RDump/R2RDump.dll"
__R2RDumpCommand+=" --header --sc --in $__OutputFile --out $__OutputFile.r2rdump --val"
__R2RDumpCommand+=" --header --sc --in $__OutputFileFinal --out $__OutputFileFinal.r2rdump --val"

__Command="$_DebuggerFullPath $CORE_ROOT/crossgen2/crossgen2"
__Command+=" @$__ResponseFile"
__Command+=" $ExtraCrossGen2Args"
if [ -n "$(CrossGen2OutputFormat)" ]; then
__Command+=" -f $(CrossGen2OutputFormat)"
fi

# Expand glob or multiple filenames into array
__InputFiles=($2)
__InputFiles=($3)
for dllFile in "${__InputFiles[@]}"; do
echo "$dllFile" >> "$__ResponseFile"
done
Expand Down Expand Up @@ -148,6 +152,14 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
$__Command
__cg2ExitCode=$?

__linkExitCode=0
if [ "$(CrossGen2OutputFormat)" == "macho" ]; then
echo "Linking: $(basename "$__OutputFile") -> $(basename "$__OutputFileFinal")"
echo clang -dynamiclib -o "$__OutputFileFinal" "$__OutputFile" -install_name "@rpath/`basename "$__OutputFileFinal"`" -Wl,-dead_strip
clang -dynamiclib -o "$__OutputFileFinal" "$__OutputFile" -install_name "@rpath/`basename "$__OutputFileFinal"`" -Wl,-dead_strip
__linkExitCode=$?
fi

echo "Running R2RDump: $__R2RDumpCommand"
$__R2RDumpCommand
__r2rDumpExitCode=$?
Expand All @@ -159,7 +171,13 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then

if [ ! -z ${CompositeBuildMode+x} ]%3B then
shopt -s nullglob
RunCrossgen2OnFiles "$PWD/composite-r2r.dll" "$PWD/IL-CG2/*.dll"
__CompositeExt=".dll"
__CompositeExtFinal=".dll"
if [ "$(CrossGen2OutputFormat)" == "macho" ]; then
__CompositeExt=".o"
__CompositeExtFinal=".dylib"
fi
RunCrossgen2OnFiles "$PWD/composite-r2r${__CompositeExt}" "$PWD/composite-r2r${__CompositeExtFinal}" "$PWD/IL-CG2/*.dll"
else
ExtraCrossGen2Args+=" -r:$PWD/IL-CG2/*.dll"
for dllFile in "$PWD"/IL-CG2/*.dll
Expand All @@ -184,6 +202,11 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
ReleaseLock
exit 1
fi
if [ $__linkExitCode -ne 0 ]; then
echo "Linking failed with exitcode: $__linkExitCode"
ReleaseLock
exit 1
fi
fi
ReleaseLock
fi
Expand Down Expand Up @@ -230,7 +253,7 @@ if defined RunCrossGen2 (

mkdir IL-CG2
copy *.dll IL-CG2\
del IL-CG2\composite-r2r.dll 2>nul
del IL-CG2\composite-r2r.* 2>nul
del IL-CG2\Coreclr.TestWrapper.dll 2>nul
del IL-CG2\*.XUnitWrapper.dll 2>nul

Expand Down
3 changes: 1 addition & 2 deletions src/tests/Loader/PlatformNativeR2R/PlatformNativeR2R.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ public static void EntryPoint()
}

Assert.True(output.Contains("READYTORUN_FLAG_Component"), "Component assembly should be associated with a platform-native composite image");
// TODO: Uncomment assert when crossgen2 adds support for the flag
// Assert.True(output.Contains("READYTORUN_FLAG_PlatformNativeImage"), "Component assembly should be associated with a platform-native composite image");
Assert.True(output.Contains("READYTORUN_FLAG_PlatformNativeImage"), "Component assembly should be associated with a platform-native composite image");
}
}
}
6 changes: 2 additions & 4 deletions src/tests/Loader/PlatformNativeR2R/PlatformNativeR2R.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
<RequiresProcessIsolation>true</RequiresProcessIsolation>
<!-- Explictly testing R2R composite format -->
<AlwaysUseCrossGen2>true</AlwaysUseCrossGen2>
<!-- TODO: Enable for macOS and pass -f macho as arguments -->
<CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true'">true</CLRTestTargetUnsupported>
<!-- <CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true' and '$(TargetsOSX)' != 'true' and '$(TargetsAppleMobile)' != 'true'">true</CLRTestTargetUnsupported> -->
<!-- <CrossGen2TestExtraArguments Condition="'$(TargetsOSX)' == 'true' or '$(TargetsAppleMobile)' == 'true'">-f macho</CrossGen2TestExtraArguments> -->
<CLRTestTargetUnsupported Condition="'$(TargetsWindows)' != 'true' and '$(TargetsOSX)' != 'true' and '$(TargetsAppleMobile)' != 'true'">true</CLRTestTargetUnsupported>
<CrossGen2OutputFormat Condition="'$(TargetsOSX)' == 'true' or '$(TargetsAppleMobile)' == 'true'">macho</CrossGen2OutputFormat>
</PropertyGroup>
<ItemGroup>
<Compile Include="PlatformNativeR2R.cs" />
Expand Down