From f9dfd41994491a037cca9d1bbae964a860b2218b Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 24 Nov 2021 01:17:09 +0000 Subject: [PATCH] [wasm] Misc CI/test run improvements (#61937) - Update chrome+chromedriver for helix tests to latest stable (`96.0.4664.45`) - Enable library tests to run on Windows, for manual runs - Disable windows/AOT builds completely due to https://github.com/dotnet/runtime/issues/61721 - Disable failing WBT tests on windows due to https://github.com/dotnet/runtime/issues/61725 - Disable JS interop tests failing with new chrome - https://github.com/dotnet/runtime/issues/61945 Co-authored-by: Radek Doulik --- eng/pipelines/runtime-manual.yml | 108 +++++++++--------- eng/pipelines/runtime-staging.yml | 96 ++++++++-------- eng/testing/tests.wasm.targets | 3 +- .../JavaScript/JavaScriptTests.cs | 1 + .../JavaScript/SharedArrayBufferTests.cs | 1 + .../JavaScript/TypedArrayTests.cs | 9 ++ src/libraries/sendtohelixhelp.proj | 22 ++-- .../Wasm.Build.Tests/MainWithArgsTests.cs | 2 + .../ReferenceNewAssemblyRebuildTest.cs | 2 + .../SatelliteAssembliesTests.cs | 2 + .../Wasm.Build.Tests/Wasm.Build.Tests.csproj | 1 - .../Wasm.Build.Tests/WasmBuildAppTest.cs | 2 + 12 files changed, 138 insertions(+), 111 deletions(-) diff --git a/eng/pipelines/runtime-manual.yml b/eng/pipelines/runtime-manual.yml index e79f469471bde1..83f9e891dab573 100644 --- a/eng/pipelines/runtime-manual.yml +++ b/eng/pipelines/runtime-manual.yml @@ -280,45 +280,6 @@ jobs: eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isManualOrIsNotPR'], true), eq(variables['isFullMatrix'], true)) - ${{ if eq(variables['isFullMatrix'], true) }}: - # extra steps, run tests - extraStepsTemplate: /eng/pipelines/libraries/helix.yml - extraStepsParameters: - creator: dotnet-bot - testRunNamePrefixSuffix: Mono_$(_BuildConfig) - extraHelixArguments: /p:BrowserHost=windows - scenarios: - - normal - - wasmtestonbrowser - condition: >- - or( - eq(variables['librariesContainsChange'], true), - eq(variables['monoContainsChange'], true), - eq(variables['isManualOrIsNotPR'], true), - eq(variables['isFullMatrix'], true)) - -- template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/common/global-build-job.yml - helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml - buildConfig: release - runtimeFlavor: mono - platforms: - - Browser_wasm_win - variables: - # map dependencies variables to local variables - - name: wasmbuildtestsContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_wasmbuildtests.containsChange'] ] - jobParameters: - testGroup: innerloop - nameSuffix: Windows_wasm_WBT - buildArgs: -subset mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows /p:TestWasmBuildTests=true /p:TestAssemblies=false - timeoutInMinutes: 180 - condition: >- - or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_wasmbuildtests.containsChange'], true), - eq(variables['isManualOrIsNotPR'], true), - eq(variables['isFullMatrix'], true)) # extra steps, run tests extraStepsTemplate: /eng/pipelines/libraries/helix.yml extraStepsParameters: @@ -326,10 +287,12 @@ jobs: testRunNamePrefixSuffix: Mono_$(_BuildConfig) extraHelixArguments: /p:BrowserHost=windows scenarios: - - buildwasmapps + - normal + - wasmtestonbrowser condition: >- or( - eq(variables['wasmbuildtestsContainsChange'], true), + eq(variables['librariesContainsChange'], true), + eq(variables['monoContainsChange'], true), eq(variables['isManualOrIsNotPR'], true), eq(variables['isFullMatrix'], true)) @@ -343,20 +306,16 @@ jobs: - Browser_wasm_win variables: # map dependencies variables to local variables - - name: librariesContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] - - name: monoContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ] + - name: wasmbuildtestsContainsChange + value: $[ dependencies.evaluate_paths.outputs['SetPathVars_wasmbuildtests.containsChange'] ] jobParameters: testGroup: innerloop - nameSuffix: Windows_wasm_AOT - buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=true /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg) + nameSuffix: Windows_wasm_WBT + buildArgs: -subset mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows /p:TestWasmBuildTests=true /p:TestAssemblies=false timeoutInMinutes: 180 condition: >- or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_wasmbuildtests.containsChange'], true), eq(variables['isManualOrIsNotPR'], true), eq(variables['isFullMatrix'], true)) # extra steps, run tests @@ -364,16 +323,57 @@ jobs: extraStepsParameters: creator: dotnet-bot testRunNamePrefixSuffix: Mono_$(_BuildConfig) - extraHelixArguments: /p:BrowserHost=windows /p:NeedsToBuildWasmAppsOnHelix=true $(_runSmokeTestsOnlyArg) + extraHelixArguments: /p:BrowserHost=windows scenarios: - - normal + - buildwasmapps condition: >- or( - eq(variables['librariesContainsChange'], true), - eq(variables['monoContainsChange'], true), + eq(variables['wasmbuildtestsContainsChange'], true), eq(variables['isManualOrIsNotPR'], true), eq(variables['isFullMatrix'], true)) +# Disabled due to https://github.com/dotnet/runtime/issues/61721 +#- template: /eng/pipelines/common/platform-matrix.yml + #parameters: + #jobTemplate: /eng/pipelines/common/global-build-job.yml + #helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml + #buildConfig: release + #runtimeFlavor: mono + #platforms: + #- Browser_wasm_win + #variables: + ## map dependencies variables to local variables + #- name: librariesContainsChange + #value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] + #- name: monoContainsChange + #value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ] + #jobParameters: + #testGroup: innerloop + #nameSuffix: Windows_wasm_AOT + #buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=true /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg) + #timeoutInMinutes: 180 + #condition: >- + #or( + #eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), + #eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + #eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), + #eq(variables['isManualOrIsNotPR'], true), + #eq(variables['isFullMatrix'], true)) + ## extra steps, run tests + #extraStepsTemplate: /eng/pipelines/libraries/helix.yml + #extraStepsParameters: + #creator: dotnet-bot + #testRunNamePrefixSuffix: Mono_$(_BuildConfig) + #extraHelixArguments: /p:BrowserHost=windows /p:NeedsToBuildWasmAppsOnHelix=true $(_runSmokeTestsOnlyArg) + #scenarios: + #- normal + #condition: >- + #or( + #eq(variables['librariesContainsChange'], true), + #eq(variables['monoContainsChange'], true), + #eq(variables['isManualOrIsNotPR'], true), + #eq(variables['isFullMatrix'], true)) + # # Build for Browser/wasm, with EnableAggressiveTrimming=true # diff --git a/eng/pipelines/runtime-staging.yml b/eng/pipelines/runtime-staging.yml index fa634a1e571d25..a38deea1927a5c 100644 --- a/eng/pipelines/runtime-staging.yml +++ b/eng/pipelines/runtime-staging.yml @@ -464,53 +464,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: Windows_wasm - buildArgs: -subset mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows - timeoutInMinutes: 180 - condition: >- - or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), - eq(variables['isManualOrIsNotPR'], true), - eq(variables['isFullMatrix'], true)) - ${{ if eq(variables['isFullMatrix'], true) }}: - # extra steps, run tests - extraStepsTemplate: /eng/pipelines/libraries/helix.yml - extraStepsParameters: - creator: dotnet-bot - testRunNamePrefixSuffix: Mono_$(_BuildConfig) - extraHelixArguments: /p:BrowserHost=windows - scenarios: - - normal - - wasmtestonbrowser - condition: >- - or( - eq(variables['librariesContainsChange'], true), - eq(variables['monoContainsChange'], true), - eq(variables['isManualOrIsNotPR'], true), - eq(variables['isFullMatrix'], true)) - -# -# Build Browser_wasm, on windows, and run tests with AOT -# -- template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/common/global-build-job.yml - helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml - buildConfig: release - runtimeFlavor: mono - platforms: - - Browser_wasm_win - variables: - # map dependencies variables to local variables - - name: librariesContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] - - name: monoContainsChange - value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ] - jobParameters: - testGroup: innerloop - nameSuffix: Windows_wasm_AOT - buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=true /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg) + buildArgs: -subset mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows $(_runSmokeTestsOnlyArg) timeoutInMinutes: 180 condition: >- or( @@ -524,9 +478,10 @@ jobs: extraStepsParameters: creator: dotnet-bot testRunNamePrefixSuffix: Mono_$(_BuildConfig) - extraHelixArguments: /p:BrowserHost=windows /p:NeedsToBuildWasmAppsOnHelix=true $(_runSmokeTestsOnlyArg) + extraHelixArguments: /p:BrowserHost=windows $(_runSmokeTestsOnlyArg) scenarios: - normal + - wasmtestonbrowser condition: >- or( eq(variables['librariesContainsChange'], true), @@ -534,6 +489,51 @@ jobs: eq(variables['isManualOrIsNotPR'], true), eq(variables['isFullMatrix'], true)) +# +# Build Browser_wasm, on windows, and run tests with AOT +# +# Disabled due to https://github.com/dotnet/runtime/issues/61721 +#- template: /eng/pipelines/common/platform-matrix.yml + #parameters: + #jobTemplate: /eng/pipelines/common/global-build-job.yml + #helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml + #buildConfig: release + #runtimeFlavor: mono + #platforms: + #- Browser_wasm_win + #variables: + ## map dependencies variables to local variables + #- name: librariesContainsChange + #value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] + #- name: monoContainsChange + #value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ] + #jobParameters: + #testGroup: innerloop + #nameSuffix: Windows_wasm_AOT + #buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:BrowserHost=windows /p:EnableAggressiveTrimming=true /p:BuildAOTTestsOnHelix=true /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg) + #timeoutInMinutes: 180 + #condition: >- + #or( + #eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), + #eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + #eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), + #eq(variables['isManualOrIsNotPR'], true), + #eq(variables['isFullMatrix'], true)) + ## extra steps, run tests + #extraStepsTemplate: /eng/pipelines/libraries/helix.yml + #extraStepsParameters: + #creator: dotnet-bot + #testRunNamePrefixSuffix: Mono_$(_BuildConfig) + #extraHelixArguments: /p:BrowserHost=windows /p:NeedsToBuildWasmAppsOnHelix=true $(_runSmokeTestsOnlyArg) + #scenarios: + #- normal + #condition: >- + #or( + #eq(variables['librariesContainsChange'], true), + #eq(variables['monoContainsChange'], true), + #eq(variables['isManualOrIsNotPR'], true), + #eq(variables['isFullMatrix'], true)) + # # Build Browser_wasm, on windows, and run Wasm.Build.Tests diff --git a/eng/testing/tests.wasm.targets b/eng/testing/tests.wasm.targets index 000316cfd46d56..0286959859cc1e 100644 --- a/eng/testing/tests.wasm.targets +++ b/eng/testing/tests.wasm.targets @@ -10,7 +10,8 @@ so, just setting it true by default --> true - <_ShellCommandSeparator Condition="'$(OS)' == 'Windows_NT'">& + + <_ShellCommandSeparator Condition="'$(OS)' == 'Windows_NT'">&& <_ShellCommandSeparator Condition="'$(OS)' != 'Windows_NT'">&& diff --git a/src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/JavaScriptTests.cs b/src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/JavaScriptTests.cs index 7158c38899c13a..146575af368389 100644 --- a/src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/JavaScriptTests.cs +++ b/src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/JavaScriptTests.cs @@ -11,6 +11,7 @@ namespace System.Runtime.InteropServices.JavaScript.Tests public static class JavaScriptTests { [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/61945", TestPlatforms.Browser)] public static void CoreTypes() { var arr = new Uint8ClampedArray(50); diff --git a/src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/SharedArrayBufferTests.cs b/src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/SharedArrayBufferTests.cs index 7ca2e660a4e9af..d5b7df4cc34cfc 100644 --- a/src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/SharedArrayBufferTests.cs +++ b/src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/SharedArrayBufferTests.cs @@ -6,6 +6,7 @@ namespace System.Runtime.InteropServices.JavaScript.Tests { + [ActiveIssue("https://github.com/dotnet/runtime/issues/61945", TestPlatforms.Browser)] public static class SharedArrayBufferTests { private static Function _objectPrototype; diff --git a/src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/TypedArrayTests.cs b/src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/TypedArrayTests.cs index 896835795f1986..0b7075893a40d8 100644 --- a/src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/TypedArrayTests.cs +++ b/src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/TypedArrayTests.cs @@ -108,6 +108,7 @@ public static void Float64ArrayFrom(Function objectPrototype) } [Theory] + [ActiveIssue("https://github.com/dotnet/runtime/issues/61945", TestPlatforms.Browser)] [MemberData(nameof(Object_Prototype))] public static void Uint8ClampedArrayFromSharedArrayBuffer(Function objectPrototype) { @@ -117,6 +118,7 @@ public static void Uint8ClampedArrayFromSharedArrayBuffer(Function objectPrototy } [Theory] + [ActiveIssue("https://github.com/dotnet/runtime/issues/61945", TestPlatforms.Browser)] [MemberData(nameof(Object_Prototype))] public static void Uint8ArrayFromSharedArrayBuffer(Function objectPrototype) { @@ -126,6 +128,7 @@ public static void Uint8ArrayFromSharedArrayBuffer(Function objectPrototype) } [Theory] + [ActiveIssue("https://github.com/dotnet/runtime/issues/61945", TestPlatforms.Browser)] [MemberData(nameof(Object_Prototype))] public static void Uint16ArrayFromSharedArrayBuffer(Function objectPrototype) { @@ -135,6 +138,7 @@ public static void Uint16ArrayFromSharedArrayBuffer(Function objectPrototype) } [Theory] + [ActiveIssue("https://github.com/dotnet/runtime/issues/61945", TestPlatforms.Browser)] [MemberData(nameof(Object_Prototype))] public static void Uint32ArrayFromSharedArrayBuffer(Function objectPrototype) { @@ -144,6 +148,7 @@ public static void Uint32ArrayFromSharedArrayBuffer(Function objectPrototype) } [Theory] + [ActiveIssue("https://github.com/dotnet/runtime/issues/61945", TestPlatforms.Browser)] [MemberData(nameof(Object_Prototype))] public static void Int8ArrayFromSharedArrayBuffer(Function objectPrototype) { @@ -153,6 +158,7 @@ public static void Int8ArrayFromSharedArrayBuffer(Function objectPrototype) } [Theory] + [ActiveIssue("https://github.com/dotnet/runtime/issues/61945", TestPlatforms.Browser)] [MemberData(nameof(Object_Prototype))] public static void Int16ArrayFromSharedArrayBuffer(Function objectPrototype) { @@ -162,6 +168,7 @@ public static void Int16ArrayFromSharedArrayBuffer(Function objectPrototype) } [Theory] + [ActiveIssue("https://github.com/dotnet/runtime/issues/61945", TestPlatforms.Browser)] [MemberData(nameof(Object_Prototype))] public static void Int32ArrayFromSharedArrayBuffer(Function objectPrototype) { @@ -171,6 +178,7 @@ public static void Int32ArrayFromSharedArrayBuffer(Function objectPrototype) } [Theory] + [ActiveIssue("https://github.com/dotnet/runtime/issues/61945", TestPlatforms.Browser)] [MemberData(nameof(Object_Prototype))] public static void Float32ArrayFromSharedArrayBuffer(Function objectPrototype) { @@ -180,6 +188,7 @@ public static void Float32ArrayFromSharedArrayBuffer(Function objectPrototype) } [Theory] + [ActiveIssue("https://github.com/dotnet/runtime/issues/61945", TestPlatforms.Browser)] [MemberData(nameof(Object_Prototype))] public static void Float64ArrayFromSharedArrayBuffer(Function objectPrototype) { diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index 83eeca33b065d5..c3f4fc1549607b 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -364,15 +364,23 @@ Workloads- EMSDK- + + - - - 768968 + 929513 https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/$(ChromiumRevision)/chrome-linux.zip https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/$(ChromiumRevision)/chromedriver_linux64.zip - 768983 + 929513 https://storage.googleapis.com/chromium-browser-snapshots/Win_x64/$(ChromiumRevision)/chrome-win.zip https://storage.googleapis.com/chromium-browser-snapshots/Win_x64/$(ChromiumRevision)/chromedriver_win32.zip @@ -431,9 +439,9 @@ - - - + + + diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/MainWithArgsTests.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/MainWithArgsTests.cs index b97a0490d2e872..73598d8b079b13 100644 --- a/src/tests/BuildWasmApps/Wasm.Build.Tests/MainWithArgsTests.cs +++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/MainWithArgsTests.cs @@ -25,6 +25,7 @@ public MainWithArgsTests(ITestOutputHelper output, SharedBuildPerTestClassFixtur ).WithRunHosts(host).UnwrapItemsAsArrays(); [Theory] + [ActiveIssue("https://github.com/dotnet/runtime/issues/61725", TestPlatforms.Windows)] [MemberData(nameof(MainWithArgsTestData), parameters: new object[] { /*aot*/ false, RunHost.All })] [MemberData(nameof(MainWithArgsTestData), parameters: new object[] { /*aot*/ true, RunHost.All })] public void AsyncMainWithArgs(BuildArgs buildArgs, string[] args, RunHost host, string id) @@ -39,6 +40,7 @@ public static async System.Threading.Tasks.Task Main(string[] args) buildArgs, args, host, id); [Theory] + [ActiveIssue("https://github.com/dotnet/runtime/issues/61725", TestPlatforms.Windows)] [MemberData(nameof(MainWithArgsTestData), parameters: new object[] { /*aot*/ false, RunHost.All })] [MemberData(nameof(MainWithArgsTestData), parameters: new object[] { /*aot*/ true, RunHost.All })] public void TopLevelWithArgs(BuildArgs buildArgs, string[] args, RunHost host, string id) diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/ReferenceNewAssemblyRebuildTest.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/ReferenceNewAssemblyRebuildTest.cs index 5aa3d2916f36fe..d920ac400559ab 100644 --- a/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/ReferenceNewAssemblyRebuildTest.cs +++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/ReferenceNewAssemblyRebuildTest.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; using System.IO; using System.Linq; using Wasm.Build.Tests; @@ -19,6 +20,7 @@ public ReferenceNewAssemblyRebuildTest(ITestOutputHelper output, SharedBuildPerT } [Theory] + [ActiveIssue("https://github.com/dotnet/runtime/issues/61725", TestPlatforms.Windows)] [MemberData(nameof(NativeBuildData))] public void ReferenceNewAssembly(BuildArgs buildArgs, bool nativeRelink, bool invariant, RunHost host, string id) { diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/SatelliteAssembliesTests.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/SatelliteAssembliesTests.cs index 3532028dcc4917..b65c274ae62ed4 100644 --- a/src/tests/BuildWasmApps/Wasm.Build.Tests/SatelliteAssembliesTests.cs +++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/SatelliteAssembliesTests.cs @@ -29,6 +29,7 @@ public SatelliteAssembliesTests(ITestOutputHelper output, SharedBuildPerTestClas .UnwrapItemsAsArrays(); [Theory] + [ActiveIssue("https://github.com/dotnet/runtime/issues/61725", TestPlatforms.Windows)] [MemberData(nameof(SatelliteAssemblyTestData), parameters: new object[] { /*aot*/ false, /*relinking*/ false, RunHost.All })] [MemberData(nameof(SatelliteAssemblyTestData), parameters: new object[] { /*aot*/ false, /*relinking*/ true, RunHost.All })] [MemberData(nameof(SatelliteAssemblyTestData), parameters: new object[] { /*aot*/ true, /*relinking*/ false, RunHost.All })] @@ -66,6 +67,7 @@ public void ResourcesFromMainAssembly(BuildArgs buildArgs, } [Theory] + [ActiveIssue("https://github.com/dotnet/runtime/issues/61725", TestPlatforms.Windows)] [MemberData(nameof(SatelliteAssemblyTestData), parameters: new object[] { /*aot*/ false, /*relinking*/ false, RunHost.All })] [MemberData(nameof(SatelliteAssemblyTestData), parameters: new object[] { /*aot*/ false, /*relinking*/ true, RunHost.All })] [MemberData(nameof(SatelliteAssemblyTestData), parameters: new object[] { /*aot*/ true, /*relinking*/ false, RunHost.All })] diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/Wasm.Build.Tests.csproj b/src/tests/BuildWasmApps/Wasm.Build.Tests/Wasm.Build.Tests.csproj index 445e6c6d0987eb..9411e65e0be56e 100644 --- a/src/tests/BuildWasmApps/Wasm.Build.Tests/Wasm.Build.Tests.csproj +++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/Wasm.Build.Tests.csproj @@ -1,7 +1,6 @@ $(NetCoreAppToolCurrent) - true true true true diff --git a/src/tests/BuildWasmApps/Wasm.Build.Tests/WasmBuildAppTest.cs b/src/tests/BuildWasmApps/Wasm.Build.Tests/WasmBuildAppTest.cs index 412bf4a3da2eae..68bc578754c04b 100644 --- a/src/tests/BuildWasmApps/Wasm.Build.Tests/WasmBuildAppTest.cs +++ b/src/tests/BuildWasmApps/Wasm.Build.Tests/WasmBuildAppTest.cs @@ -21,6 +21,7 @@ public WasmBuildAppTest(ITestOutputHelper output, SharedBuildPerTestClassFixture .UnwrapItemsAsArrays(); [Theory] + [ActiveIssue("https://github.com/dotnet/runtime/issues/61725", TestPlatforms.Windows)] [MemberData(nameof(MainMethodTestData), parameters: new object[] { /*aot*/ true, RunHost.All })] [MemberData(nameof(MainMethodTestData), parameters: new object[] { /*aot*/ false, RunHost.All })] public void TopLevelMain(BuildArgs buildArgs, RunHost host, string id) @@ -29,6 +30,7 @@ public void TopLevelMain(BuildArgs buildArgs, RunHost host, string id) buildArgs, host, id); [Theory] + [ActiveIssue("https://github.com/dotnet/runtime/issues/61725", TestPlatforms.Windows)] [MemberData(nameof(MainMethodTestData), parameters: new object[] { /*aot*/ true, RunHost.All })] [MemberData(nameof(MainMethodTestData), parameters: new object[] { /*aot*/ false, RunHost.All })] public void AsyncMain(BuildArgs buildArgs, RunHost host, string id)