Skip to content

Commit c35a46e

Browse files
lewingCopilot
andauthored
Restore non-blocking browser WASM R2R runtime tests (#133463)
Fixes #133305. Restore the browser-wasm CoreCLR `R2R_CG2` runtime-test job removed by #133294 to the default `runtime` pipeline. The job continues on error and does not participate in the shared Helix monitor so known product failures remain visible without blocking unrelated PRs. The temporary manual-pipeline implementation from #133308 is removed now that the lane is back in the default pipeline. Fresh main and PR-head censuses were inspected through Helix work-item logs and Azure DevOps test results, including failures hidden behind successful merged-runner work-item exits. Reproducible failures are isolated at method/type scope, or at project preflight scope where out-of-process execution or invalid module construction prevents managed dispatch. Known trackers used by the exclusions include #132855, #133219, #133307, #133464–#133469, and #133502–#133506. Coverage-preserving handling: - `Runtime_76273`, `GitHub_22888`, `Regression4`, and four collectible-assembly tests treat an empty `Assembly.Location` as unavailable file-backed setup and still execute normally when assembly files exist. - `InterpreterTester` remains active; only the failing `TestMdArray` and `TestPInvoke` subtests are bypassed for wasm ReadyToRun. - `b125091` and `pinnedlocal` remain unsuppressed. - `Vector3Interop` is unchanged: forward P/Invoke remains active and only reverse P/Invoke retains its existing browser CoreCLR exclusion. - Out-of-process `StructABI`, `more_tailcalls`, and `Runtime_101046`, plus the two >1,000-parameter merged assemblies, use wasm-CoreCLR `R2RIncompatible` because their failures occur before a managed method-level skip can run. The non-blocking status is intentional until the known exclusions are removed and rolling evidence is clean. New failures remain visible in the dedicated R2R job and published test results. > [!NOTE] > This pull request description was drafted with GitHub Copilot. --------- Co-authored-by: Copilot App <[email protected]>
1 parent 78fcecd commit c35a46e

40 files changed

Lines changed: 164 additions & 87 deletions

File tree

‎eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml‎

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ parameters:
1111
excludeNonLibTests: false
1212
excludeOptional: true
1313
debuggerTestsOnly: false
14-
runR2RTests: false
1514

1615
jobs:
1716

@@ -176,78 +175,6 @@ jobs:
176175
- WasmTestOnWasmtime
177176

178177
- ${{ if and(ne(variables.isRollingBuild, true), ne(parameters.excludeNonLibTests, true), ne(parameters.debuggerTestsOnly, true)) }}:
179-
- ${{ if eq(parameters.runR2RTests, true) }}:
180-
- template: /eng/pipelines/common/platform-matrix.yml
181-
parameters:
182-
jobTemplate: /eng/pipelines/common/templates/runtimes/build-test-job.yml
183-
buildConfig: checked
184-
platforms:
185-
- CoreClrTestBuildHost
186-
jobParameters:
187-
testGroup: innerloop
188-
189-
- template: /eng/pipelines/common/platform-matrix.yml
190-
parameters:
191-
jobTemplate: /eng/pipelines/common/global-build-job.yml
192-
buildConfig: checked
193-
platforms:
194-
- browser_wasm
195-
jobParameters:
196-
nameSuffix: CoreCLR_ReleaseLibraries
197-
buildArgs: -s clr+libs+libs.tests+packs -c Release -rc $(_BuildConfig) /p:TestAssemblies=false /p:ArchiveTests=true /p:InstallWorkloadForTesting=false
198-
timeoutInMinutes: 120
199-
postBuildSteps:
200-
- template: /eng/pipelines/coreclr/templates/build-native-test-assets-step.yml
201-
parameters:
202-
extraBuildArgs: -os browser
203-
- template: /eng/pipelines/common/upload-artifact-step.yml
204-
parameters:
205-
rootFolder: $(Build.SourcesDirectory)/artifacts/bin
206-
includeRootFolder: false
207-
archiveType: $(archiveType)
208-
archiveExtension: $(archiveExtension)
209-
tarCompression: $(tarCompression)
210-
artifactName: CoreCLR_ReleaseLibraries_BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_hostedOs)_$(_BuildConfig)
211-
displayName: Build Assets
212-
- template: /eng/pipelines/common/upload-artifact-step.yml
213-
parameters:
214-
rootFolder: $(Build.SourcesDirectory)/artifacts/helix
215-
includeRootFolder: false
216-
archiveType: $(archiveType)
217-
archiveExtension: $(archiveExtension)
218-
tarCompression: $(tarCompression)
219-
artifactName: CoreCLR_ReleaseLibraries_TestArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_hostedOs)_$(_BuildConfig)
220-
- template: /eng/pipelines/common/wasm-post-build-steps.yml
221-
parameters:
222-
publishArtifactsForWorkload: true
223-
publishWBT: true
224-
extraVariablesTemplates:
225-
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
226-
parameters:
227-
testGroup: innerloop
228-
liveLibrariesBuildConfig: Release
229-
- template: /eng/pipelines/common/templates/runtimes/native-test-assets-variables.yml
230-
parameters:
231-
testGroup: innerloop
232-
233-
- template: /eng/pipelines/common/platform-matrix.yml
234-
parameters:
235-
jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml
236-
buildConfig: checked
237-
platforms:
238-
- browser_wasm
239-
helixQueueGroup: pr
240-
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
241-
jobParameters:
242-
testGroup: innerloop
243-
readyToRun: true
244-
displayNameArgs: R2R_CG2
245-
liveLibrariesBuildConfig: Release
246-
unifiedArtifactsName: CoreCLR_ReleaseLibraries_BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_hostedOs)_$(_BuildConfig)
247-
unifiedBuildNameSuffix: CoreCLR_ReleaseLibraries
248-
useHelixMonitor: ${{ parameters.useHelixMonitor }}
249-
extraBuildArgs: -os browser -p:HostConfiguration=Release
250-
251178
# Builds only
252179
- template: /eng/pipelines/common/templates/wasm-build-only.yml
253180
parameters:

‎eng/pipelines/runtime-wasm-non-libtests.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,3 @@ extends:
3131
useHelixMonitor: ${{ variables.enableHelixJobMonitor }}
3232
excludeNonLibTests: false
3333
excludeLibTests: true
34-
runR2RTests: true

‎eng/pipelines/runtime.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1957,6 +1957,36 @@ extends:
19571957
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_wasm_coreclr_runtimetests.containsChange'], true),
19581958
eq(variables['isRollingBuild'], true))
19591959
1960+
- template: /eng/pipelines/common/platform-matrix.yml
1961+
parameters:
1962+
jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml
1963+
buildConfig: checked
1964+
platforms:
1965+
- browser_wasm
1966+
helixQueueGroup: pr
1967+
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
1968+
# Keep known failures visible without blocking the runtime pipeline.
1969+
# Tracked by https://github.com/dotnet/runtime/issues/133305.
1970+
shouldContinueOnError: true
1971+
jobParameters:
1972+
testGroup: innerloop
1973+
readyToRun: true
1974+
displayNameArgs: R2R_CG2
1975+
liveLibrariesBuildConfig: Release
1976+
unifiedArtifactsName: CoreCLR_ReleaseLibraries_BuildArtifacts_$(osGroup)$(osSubgroup)_$(archType)_$(_hostedOs)_$(_BuildConfig)
1977+
unifiedBuildNameSuffix: CoreCLR_ReleaseLibraries
1978+
# The shared monitor would turn this non-blocking lane into a pipeline failure.
1979+
useHelixMonitor: false
1980+
extraBuildArgs: -os browser -p:HostConfiguration=Release
1981+
condition: >-
1982+
or(
1983+
eq(variables['wasmDarcDependenciesChanged'], true),
1984+
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true),
1985+
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true),
1986+
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_tools_illink.containsChange'], true),
1987+
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_wasm_coreclr_runtimetests.containsChange'], true),
1988+
eq(variables['isRollingBuild'], true))
1989+
19601990
- template: /eng/pipelines/common/platform-matrix.yml
19611991
parameters:
19621992
jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml

‎src/tests/Common/CoreCLRTestLibrary/PlatformDetection.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ public static bool IsMonoInterpreter
112112
public static bool IsWasi => OperatingSystem.IsWasi();
113113
public static bool IsWasm => IsBrowser || IsWasi;
114114
public static bool IsReadyToRunCompiled => Environment.GetEnvironmentVariable("TEST_READY_TO_RUN_MODE") == "1";
115+
public static bool IsWasmReadyToRun => IsWasm && IsReadyToRunCompiled;
115116
public static bool IsNotMultithreadingSupported => !IsMultithreadingSupported;
116117
public static bool IsMultithreadingSupported => RuntimeFeature.IsMultithreadingSupported;
117118

‎src/tests/GC/Features/HeapExpansion/bestfit-finalize.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
<GCStressIncompatible>true</GCStressIncompatible>
1010
<!-- The test timeouts when running tests in parallel -->
1111
<UnloadabilityIncompatible>true</UnloadabilityIncompatible>
12+
<!-- ActiveIssue https://github.com/dotnet/runtime/issues/133469 -->
13+
<R2RIncompatible Condition="'$(TargetArchitecture)' == 'wasm' and '$(RuntimeFlavor)' == 'coreclr'">true</R2RIncompatible>
1214
</PropertyGroup>
1315
<ItemGroup>
1416
<Compile Include="bestfit-finalize.cs" />

‎src/tests/GC/Features/HeapExpansion/bestfit.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<CLRTestExecutionArguments>1 1000 50000</CLRTestExecutionArguments>
99

1010
<GCStressIncompatible>true</GCStressIncompatible>
11+
<!-- ActiveIssue https://github.com/dotnet/runtime/issues/133469 -->
12+
<R2RIncompatible Condition="'$(TargetArchitecture)' == 'wasm' and '$(RuntimeFlavor)' == 'coreclr'">true</R2RIncompatible>
1113
</PropertyGroup>
1214
<ItemGroup>
1315
<Compile Include="bestfit.cs" />

‎src/tests/GC/Features/HeapExpansion/bestfit_1.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<CLRTestExecutionArguments>1 1000 50000</CLRTestExecutionArguments>
99

1010
<GCStressIncompatible>true</GCStressIncompatible>
11+
<!-- ActiveIssue https://github.com/dotnet/runtime/issues/133469 -->
12+
<R2RIncompatible Condition="'$(TargetArchitecture)' == 'wasm' and '$(RuntimeFlavor)' == 'coreclr'">true</R2RIncompatible>
1113
</PropertyGroup>
1214
<PropertyGroup>
1315
<DebugType>PdbOnly</DebugType>

‎src/tests/JIT/Directed/StructABI/StructABI.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
<!-- Needed for CMakeProjectReference -->
44
<RequiresProcessIsolation>true</RequiresProcessIsolation>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
6+
<!-- ActiveIssue https://github.com/dotnet/runtime/issues/133502 -->
7+
<R2RIncompatible Condition="'$(TargetArchitecture)' == 'wasm' and '$(RuntimeFlavor)' == 'coreclr'">true</R2RIncompatible>
68
</PropertyGroup>
79
<PropertyGroup>
810
<DebugType>PdbOnly</DebugType>

‎src/tests/JIT/Directed/array-il/_Arrayscomplex3.ilproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,7 @@
66
<ItemGroup>
77
<Compile Include="complex3.il" />
88
</ItemGroup>
9+
<ItemGroup>
10+
<ProjectReference Include="$(TestLibraryProjectPath)" />
11+
</ItemGroup>
912
</Project>

‎src/tests/JIT/Directed/array-il/complex3.il‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
.publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A )
77
.ver 4:0:0:0
88
}
9+
.assembly extern Microsoft.DotNet.XUnitExtensions
10+
{
11+
.publickeytoken = (31 BF 38 56 AD 36 4E 35 )
12+
}
13+
.assembly extern TestLibrary { .ver 0:0:0:0 }
914
.assembly extern xunit.core {}
1015

1116
.assembly extern legacy library mscorlib {}
@@ -41,6 +46,11 @@
4146

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

416426
} // end of class 'Complex2_Array_Test'
417-

0 commit comments

Comments
 (0)