Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions src/tests/Common/CLRTest.CrossGen.targets
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ WARNING: When setting properties based on their current state (for example:
Tests can opt out of ahead-of-time (AOT) compilation from crossgen / crossgen2 by setting this property in their project:

<CrossGenTest>false</CrossGenTest>

Tests can opt out of composite crossgen2 only by setting this property in their project:

<CompositeCrossGenTest>false</CompositeCrossGenTest>

-->
<Target Name="GetCrossgenBashScript">

Expand All @@ -46,6 +51,11 @@ if [ "$(AlwaysUseCrossGen2)" == "true" ]; then
export CompositeBuildMode=1
fi

# CompositeBuildMode is an opt-in by variable presence.
if [ "$(CompositeCrossGenTest)" = "false" ] && [ -n "${CompositeBuildMode+x}" ]; then
unset CompositeBuildMode
fi

# CrossGen2 Script
if [ ! -z ${RunCrossGen2+x} ]%3B then
compilationDoneFlagFile="IL-CG2/done"
Expand Down Expand Up @@ -232,6 +242,13 @@ if /i "$(AlwaysUseCrossGen2)" == "true" (
set CompositeBuildMode=1
)

if /i "$(CompositeCrossGenTest)" == "false" (
REM CompositeBuildMode is an opt-in by variable presence.
if defined CompositeBuildMode (
set CompositeBuildMode=
)
)

REM CrossGen2 Script
if defined RunCrossGen2 (
set ExtraCrossGen2Args=!ExtraCrossGen2Args! $(CrossGen2TestExtraArguments)
Expand Down
1 change: 1 addition & 0 deletions src/tests/JIT/jit64/jit64_3.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<MergedWrapperProjectReference Include="opt/**/*.??proj" />
<MergedWrapperProjectReference Remove="opt/cse/Huge*.??proj" />
</ItemGroup>

<Import Project="$(TestSourceDir)MergedTestRunner.targets" />
Expand Down
12 changes: 12 additions & 0 deletions src/tests/JIT/jit64/jit64_3_huge.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- The Huge tests exceed composite CrossGen2 memory limits when merged with the other CSE tests. -->
<CompositeCrossGenTest>false</CompositeCrossGenTest>
</PropertyGroup>

<ItemGroup>
<MergedWrapperProjectReference Include="opt/cse/Huge*.??proj" />
</ItemGroup>

<Import Project="$(TestSourceDir)MergedTestRunner.targets" />
</Project>
Loading