Skip to content
Merged
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
73 changes: 0 additions & 73 deletions eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ parameters:
excludeNonLibTests: false
excludeOptional: true
debuggerTestsOnly: false
runR2RTests: false

jobs:

Expand Down Expand Up @@ -176,78 +175,6 @@ jobs:
- WasmTestOnWasmtime

- ${{ if and(ne(variables.isRollingBuild, true), ne(parameters.excludeNonLibTests, true), ne(parameters.debuggerTestsOnly, true)) }}:
- ${{ if eq(parameters.runR2RTests, true) }}:
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml
buildConfig: checked
platforms:
- CoreClrTestBuildHost
jobParameters:
testGroup: innerloop

- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/common/global-build-job.yml
buildConfig: checked
platforms:
- browser_wasm
jobParameters:
nameSuffix: CoreCLR_ReleaseLibraries
buildArgs: -s clr+libs+libs.tests+packs -c Release -rc $(_BuildConfig) /p:TestAssemblies=false /p:ArchiveTests=true /p:InstallWorkloadForTesting=false
timeoutInMinutes: 120
postBuildSteps:
- template: /eng/pipelines/coreclr/templates/build-native-test-assets-step.yml
parameters:
extraBuildArgs: -os browser
- template: /eng/pipelines/common/upload-artifact-step.yml
parameters:
rootFolder: $(Build.SourcesDirectory)/artifacts/bin
includeRootFolder: false
archiveType: $(archiveType)
archiveExtension: $(archiveExtension)
tarCompression: $(tarCompression)
artifactName: CoreCLR_ReleaseLibraries_BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_hostedOs)_$(_BuildConfig)
displayName: Build Assets
- template: /eng/pipelines/common/upload-artifact-step.yml
parameters:
rootFolder: $(Build.SourcesDirectory)/artifacts/helix
includeRootFolder: false
archiveType: $(archiveType)
archiveExtension: $(archiveExtension)
tarCompression: $(tarCompression)
artifactName: CoreCLR_ReleaseLibraries_TestArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_hostedOs)_$(_BuildConfig)
- template: /eng/pipelines/common/wasm-post-build-steps.yml
parameters:
publishArtifactsForWorkload: true
publishWBT: true
extraVariablesTemplates:
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
parameters:
testGroup: innerloop
liveLibrariesBuildConfig: Release
- template: /eng/pipelines/common/templates/runtimes/native-test-assets-variables.yml
parameters:
testGroup: innerloop

- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml
buildConfig: checked
platforms:
- browser_wasm
helixQueueGroup: pr
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
jobParameters:
testGroup: innerloop
readyToRun: true
displayNameArgs: R2R_CG2
liveLibrariesBuildConfig: Release
unifiedArtifactsName: CoreCLR_ReleaseLibraries_BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_hostedOs)_$(_BuildConfig)
unifiedBuildNameSuffix: CoreCLR_ReleaseLibraries
useHelixMonitor: ${{ parameters.useHelixMonitor }}
extraBuildArgs: -os browser -p:HostConfiguration=Release

# Builds only
- template: /eng/pipelines/common/templates/wasm-build-only.yml
parameters:
Expand Down
1 change: 0 additions & 1 deletion eng/pipelines/runtime-wasm-non-libtests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,3 @@ extends:
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
excludeNonLibTests: false
excludeLibTests: true
runR2RTests: true
30 changes: 30 additions & 0 deletions eng/pipelines/runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1957,6 +1957,36 @@ extends:
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_wasm_coreclr_runtimetests.containsChange'], true),
eq(variables['isRollingBuild'], true))

- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml
buildConfig: checked
platforms:
- browser_wasm
helixQueueGroup: pr
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
# Keep known failures visible without blocking the runtime pipeline.
# Tracked by https://github.com/dotnet/runtime/issues/133305.
shouldContinueOnError: true
jobParameters:
testGroup: innerloop
readyToRun: true
displayNameArgs: R2R_CG2
liveLibrariesBuildConfig: Release
unifiedArtifactsName: CoreCLR_ReleaseLibraries_BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_hostedOs)_$(_BuildConfig)
unifiedBuildNameSuffix: CoreCLR_ReleaseLibraries
# The shared monitor would turn this non-blocking lane into a pipeline failure.
useHelixMonitor: false
extraBuildArgs: -os browser -p:HostConfiguration=Release
condition: >-
or(
eq(variables['wasmDarcDependenciesChanged'], true),
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_tools_illink.containsChange'], true),
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_wasm_coreclr_runtimetests.containsChange'], true),
eq(variables['isRollingBuild'], true))

- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml
Expand Down
1 change: 1 addition & 0 deletions src/tests/Common/CoreCLRTestLibrary/PlatformDetection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ public static bool IsMonoInterpreter
public static bool IsWasi => OperatingSystem.IsWasi();
public static bool IsWasm => IsBrowser || IsWasi;
public static bool IsReadyToRunCompiled => Environment.GetEnvironmentVariable("TEST_READY_TO_RUN_MODE") == "1";
public static bool IsWasmReadyToRun => IsWasm && IsReadyToRunCompiled;
public static bool IsNotMultithreadingSupported => !IsMultithreadingSupported;
public static bool IsMultithreadingSupported => RuntimeFeature.IsMultithreadingSupported;

Expand Down
2 changes: 2 additions & 0 deletions src/tests/GC/Features/HeapExpansion/bestfit-finalize.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
<GCStressIncompatible>true</GCStressIncompatible>
<!-- The test timeouts when running tests in parallel -->
<UnloadabilityIncompatible>true</UnloadabilityIncompatible>
<!-- ActiveIssue https://github.com/dotnet/runtime/issues/133469 -->
<R2RIncompatible Condition="'$(TargetArchitecture)' == 'wasm' and '$(RuntimeFlavor)' == 'coreclr'">true</R2RIncompatible>
</PropertyGroup>
<ItemGroup>
<Compile Include="bestfit-finalize.cs" />
Expand Down
2 changes: 2 additions & 0 deletions src/tests/GC/Features/HeapExpansion/bestfit.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<CLRTestExecutionArguments>1 1000 50000</CLRTestExecutionArguments>

<GCStressIncompatible>true</GCStressIncompatible>
<!-- ActiveIssue https://github.com/dotnet/runtime/issues/133469 -->
<R2RIncompatible Condition="'$(TargetArchitecture)' == 'wasm' and '$(RuntimeFlavor)' == 'coreclr'">true</R2RIncompatible>
</PropertyGroup>
<ItemGroup>
<Compile Include="bestfit.cs" />
Expand Down
2 changes: 2 additions & 0 deletions src/tests/GC/Features/HeapExpansion/bestfit_1.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<CLRTestExecutionArguments>1 1000 50000</CLRTestExecutionArguments>

<GCStressIncompatible>true</GCStressIncompatible>
<!-- ActiveIssue https://github.com/dotnet/runtime/issues/133469 -->
<R2RIncompatible Condition="'$(TargetArchitecture)' == 'wasm' and '$(RuntimeFlavor)' == 'coreclr'">true</R2RIncompatible>
</PropertyGroup>
<PropertyGroup>
<DebugType>PdbOnly</DebugType>
Expand Down
2 changes: 2 additions & 0 deletions src/tests/JIT/Directed/StructABI/StructABI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
<!-- Needed for CMakeProjectReference -->
<RequiresProcessIsolation>true</RequiresProcessIsolation>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<!-- ActiveIssue https://github.com/dotnet/runtime/issues/133502 -->
<R2RIncompatible Condition="'$(TargetArchitecture)' == 'wasm' and '$(RuntimeFlavor)' == 'coreclr'">true</R2RIncompatible>
</PropertyGroup>
<PropertyGroup>
<DebugType>PdbOnly</DebugType>
Expand Down
3 changes: 3 additions & 0 deletions src/tests/JIT/Directed/array-il/_Arrayscomplex3.ilproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,7 @@
<ItemGroup>
<Compile Include="complex3.il" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(TestLibraryProjectPath)" />
</ItemGroup>
</Project>
11 changes: 10 additions & 1 deletion src/tests/JIT/Directed/array-il/complex3.il
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
.ver 4:0:0:0
}
.assembly extern Microsoft.DotNet.XUnitExtensions
{
.publickeytoken = (31 BF 38 56 AD 36 4E 35 )
}
.assembly extern TestLibrary { .ver 0:0:0:0 }
.assembly extern xunit.core {}

.assembly extern legacy library mscorlib {}
Expand Down Expand Up @@ -41,6 +46,11 @@

.class public auto ansi Complex2_Array_Test
{
.custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ActiveIssueAttribute::.ctor(string, class [mscorlib]System.Type, string[]) = {
string('https://github.com/dotnet/runtime/issues/133307')
type([TestLibrary]TestLibrary.PlatformDetection)
string[1] ('IsWasmReadyToRun')
}
.method public static int32 TestRank(value class Yak[,,,,,,] Odd_Variable) il managed
{
.maxstack 3
Expand Down Expand Up @@ -414,4 +424,3 @@ bne.un IL_0200
} // end of method 'Complex2_Array_Test::.ctor'

} // end of class 'Complex2_Array_Test'

2 changes: 2 additions & 0 deletions src/tests/JIT/Directed/tailcall/more_tailcalls.ilproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<!-- needs triage -->
<DisableProjectBuild Condition="'$(RuntimeFlavor)' == 'mono'">true</DisableProjectBuild>
<NativeAotIncompatible>true</NativeAotIncompatible>
<!-- ActiveIssue https://github.com/dotnet/runtime/issues/131890 -->
<R2RIncompatible Condition="'$(TargetArchitecture)' == 'wasm' and '$(RuntimeFlavor)' == 'coreclr'">true</R2RIncompatible>
</PropertyGroup>
<PropertyGroup>
<DebugType>PdbOnly</DebugType>
Expand Down
1 change: 1 addition & 0 deletions src/tests/JIT/Directed/tailcall/mutual_recursion.fs
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,7 @@ type Driver() =

[<SkipOnCoreClr("Unstable under JIT stress", RuntimeTestModes.AnyJitStress ||| RuntimeTestModes.AnyGCStress)>]
[<SkipOnMono("Not supported on Mono runtime")>]
[<ActiveIssue("https://github.com/dotnet/runtime/issues/133464", typeof<PlatformDetection>, [| "IsWasmReadyToRun" |])>]
[<ConditionalFact(typeof<Utilities>, [| "IsNotNativeAot" |])>]
let main () =
let driver = Driver()
Expand Down
2 changes: 2 additions & 0 deletions src/tests/JIT/Methodical/Arrays/huge/huge_b.il
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,14 @@
.assembly extern xunit.core {}
.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) }
.assembly extern TestLibrary { .ver 0:0:0:0 }

.namespace JitTest_huge_b_huge_il
{
.class public auto ansi Test
extends [mscorlib]System.Object
{
.custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ActiveIssueAttribute::.ctor(string, class [mscorlib]System.Type, string[]) = {string('https://github.com/dotnet/runtimelab/issues/155: Arrays with non-zero lower bounds') type([TestLibrary]TestLibrary.PlatformDetection) string[1] ('IsNonZeroLowerBoundArrayNotSupported') }
.custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ActiveIssueAttribute::.ctor(string, class [mscorlib]System.Type, string[]) = {string('https://github.com/dotnet/runtime/issues/133307') type([TestLibrary]TestLibrary.PlatformDetection) string[1] ('IsWasmReadyToRun') }
.method public hidebysig static int32
Main() il managed
{
Expand Down
2 changes: 2 additions & 0 deletions src/tests/JIT/Methodical/Methodical_others.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<HasMergedInTests>true</HasMergedInTests>
<!-- ActiveIssue https://github.com/dotnet/runtime/issues/132855 -->
<R2RIncompatible Condition="'$(TargetArchitecture)' == 'wasm' and '$(RuntimeFlavor)' == 'coreclr'">true</R2RIncompatible>
<!-- Tracking issue: https://github.com/dotnet/runtime/issues/90427 -->
<CLRTestTargetUnsupported Condition="'$(RuntimeFlavor)' == 'mono' and ('$(RuntimeVariant)' == 'minifullaot' or '$(RuntimeVariant)' == 'llvmfullaot')">true</CLRTestTargetUnsupported>
</PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions src/tests/JIT/Methodical/VT/port/lcs_gcref.cs
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ private static void findLCS(LCSV[,,,] c, LCSV[,,,] b, char[][] seq, LCSV[] len)
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/133307", typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.IsWasmReadyToRun))]
[SkipOnCoreClr("This test is not compatible with GCStress.", RuntimeTestModes.AnyGCStress)]
public static int TestEntryPoint()
{
Expand Down
5 changes: 5 additions & 0 deletions src/tests/JIT/Methodical/eh/basics/throwinfilter.il
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@
.assembly ASSEMBLY_NAME {}

.class public auto ansi Test_throwinfilter extends [mscorlib] System.Object {
.custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ActiveIssueAttribute::.ctor(string, class [mscorlib]System.Type, string[]) = {
string('https://github.com/dotnet/runtime/issues/133468')
type([TestLibrary]TestLibrary.PlatformDetection)
string[1] ('IsWasmReadyToRun')
}
.method public static int32 main() {
.custom instance void [xunit.core]Xunit.FactAttribute::.ctor() = (
01 00 00 00
Expand Down
7 changes: 7 additions & 0 deletions src/tests/JIT/Methodical/eh/deadcode/badcodeinsidefinally.il
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,18 @@
.ver 0:0:0:0
}
.assembly extern xunit.core {}
.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) }
.assembly extern TestLibrary { .ver 0:0:0:0 }


.class public auto ansi beforefieldinit Test_badcodeinsidefinally
extends [mscorlib]System.Object
{
.custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ActiveIssueAttribute::.ctor(string, class [mscorlib]System.Type, string[]) = {
string('https://github.com/dotnet/runtime/issues/133504')
type([TestLibrary]TestLibrary.PlatformDetection)
string[1] ('IsWasmReadyToRun')
}

.method static object GetObj() cil managed
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
<ProjectReference Include="$(TestLibraryProjectPath)" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\common\eh_common.csproj" />
<ProjectReference Include="$(TestLibraryProjectPath)" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -833,6 +833,7 @@ static public void foo(int i)


[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/133465", typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.IsWasmReadyToRun))]
static public int TestEntryPoint()
{
//Start recording
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,19 @@
}
.assembly 'b68872' { }
.assembly extern xunit.core {}
.assembly extern Microsoft.DotNet.XUnitExtensions { .publickeytoken = (31 BF 38 56 AD 36 4E 35 ) }
.assembly extern TestLibrary { .ver 0:0:0:0 }

.namespace JitTest
{
.class public auto ansi beforefieldinit Test
extends [mscorlib]System.Object
{
.custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ActiveIssueAttribute::.ctor(string, class [mscorlib]System.Type, string[]) = {
string('https://github.com/dotnet/runtime/issues/133468')
type([TestLibrary]TestLibrary.PlatformDetection)
string[1] ('IsWasmReadyToRun')
}
.method public hidebysig static int32
Main() cil managed
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ namespace b191926;

using System;
using Xunit;

public class f8192
{
internal static void Callee(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public class C
{
[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/114908", typeof(PlatformDetection), nameof(PlatformDetection.IsAppleMobile))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/133468", typeof(PlatformDetection), nameof(PlatformDetection.IsWasmReadyToRun))]
[SkipOnMono("needs triage")]
public static int TestEntryPoint()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
<!-- Excluded on x64 Unix due to LLVM non-standard ABI handling for small integer upper bits:
https://github.com/llvm/llvm-project/issues/43573 -->
<CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' == 'x64' and '$(TargetsUnix)' == 'true'">true</CLRTestTargetUnsupported>
<!-- ActiveIssue https://github.com/dotnet/runtime/issues/133506 -->
<R2RIncompatible Condition="'$(TargetArchitecture)' == 'wasm' and '$(RuntimeFlavor)' == 'coreclr'">true</R2RIncompatible>
</PropertyGroup>
<ItemGroup>
<CMakeProjectReference Include="CMakeLists.txt" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
//


using System;
Comment thread
lewing marked this conversation as resolved.
using TestLibrary;
namespace Runtime_76273;

Expand All @@ -31,9 +32,15 @@ public class Program
[ActiveIssue("https://github.com/dotnet/runtime/issues/90372", TestRuntimes.Mono)]
public static void TestEntryPoint()
{
string assemblyPath = System.Reflection.Assembly.GetExecutingAssembly().Location;
if (assemblyPath.Length == 0)
{
return;
}

CollectibleALC alc = new CollectibleALC();

System.Reflection.Assembly asm = alc.LoadFromAssemblyPath(System.Reflection.Assembly.GetExecutingAssembly().Location);
System.Reflection.Assembly asm = alc.LoadFromAssemblyPath(assemblyPath);
System.Reflection.MethodInfo mi = asm.GetType(typeof(Program).FullName).GetMethod(nameof(MainInner));
System.Type runtimeTy = asm.GetType(typeof(Runtime).FullName);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@

.class public Repro
{
.custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ActiveIssueAttribute::.ctor(string, class [mscorlib]System.Type, string[]) = {
string('https://github.com/dotnet/runtime/issues/133467')
type([TestLibrary]TestLibrary.PlatformDetection)
string[1] ('IsWasmReadyToRun')
}
.field private static class [mscorlib]System.Func`2<int32,int32> d1
.field private static class [mscorlib]System.Func`6<int32,int32,int32,int32,int32,int32> d2

Expand Down
Loading
Loading