Skip to content

Commit d98d9a2

Browse files
committed
Disable unit tests on linux-musl
On Alpine x64, ildasm executable cannot be found. The Ilasm SDK seems to be missing linux-musl recognition in its targets: https://github.com/dotnet/runtime/blob/54625f377552300ce03100b4d1689af30395f9fd/src/coreclr/src/.nuget/Microsoft.NET.Sdk.IL/targets/Microsoft.NET.Sdk.IL.targets#L32
1 parent 6f8ab45 commit d98d9a2

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

eng/Subsets.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
$(CoreClrProjectRoot)src\tools\dotnet-pgo\dotnet-pgo.csproj;
151151
$(CoreClrProjectRoot)src\tools\r2rtest\R2RTest.csproj" Category="clr" BuildInParallel="true" />
152152
<ProjectToBuild Include="$(CoreClrProjectRoot)src\tools\aot\crossgen2\crossgen2.csproj" Category="clr" />
153-
<ProjectToBuild Include="$(CoreClrProjectRoot)src\tools\aot\ILCompiler.TypeSystem.ReadyToRun.Tests\ILCompiler.TypeSystem.ReadyToRun.Tests.csproj" Test="true" Category="clr" />
153+
<ProjectToBuild Include="$(CoreClrProjectRoot)src\tools\aot\ILCompiler.TypeSystem.ReadyToRun.Tests\ILCompiler.TypeSystem.ReadyToRun.Tests.csproj" Test="true" Category="clr" Condition="'$(__DistroRid)' != 'linux-musl-x64'"/>
154154
</ItemGroup>
155155

156156
<ItemGroup Condition="$(_subset.Contains('+clr.packages+'))">

src/coreclr/src/tools/aot/ILCompiler.TypeSystem.ReadyToRun.Tests/TestTypeSystemContext.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ class TestTypeSystemContext : MetadataTypeSystemContext
2525

2626
MetadataFieldLayoutAlgorithm _metadataFieldLayout = new TestMetadataFieldLayoutAlgorithm();
2727
MetadataRuntimeInterfacesAlgorithm _metadataRuntimeInterfacesAlgorithm = new MetadataRuntimeInterfacesAlgorithm();
28-
#if !READYTORUN
2928
ArrayOfTRuntimeInterfacesAlgorithm _arrayOfTRuntimeInterfacesAlgorithm;
30-
#endif
3129
VirtualMethodAlgorithm _virtualMethodAlgorithm = new MetadataVirtualMethodAlgorithm();
3230

3331
public CanonicalizationMode CanonMode { get; set; } = CanonicalizationMode.RuntimeDetermined;
@@ -62,15 +60,12 @@ public override ModuleDesc ResolveAssembly(System.Reflection.AssemblyName name,
6260

6361
public override FieldLayoutAlgorithm GetLayoutAlgorithmForType(DefType type)
6462
{
65-
#if !READYTORUN
6663
if (type == UniversalCanonType)
6764
return UniversalCanonLayoutAlgorithm.Instance;
68-
#endif
6965

7066
return _metadataFieldLayout;
7167
}
7268

73-
#if !READYTORUN
7469
protected override RuntimeInterfacesAlgorithm GetRuntimeInterfacesAlgorithmForNonPointerArrayType(ArrayType type)
7570
{
7671
if (_arrayOfTRuntimeInterfacesAlgorithm == null)
@@ -79,7 +74,6 @@ protected override RuntimeInterfacesAlgorithm GetRuntimeInterfacesAlgorithmForNo
7974
}
8075
return _arrayOfTRuntimeInterfacesAlgorithm;
8176
}
82-
#endif
8377

8478
protected override RuntimeInterfacesAlgorithm GetRuntimeInterfacesAlgorithmForDefType(DefType type)
8579
{

0 commit comments

Comments
 (0)