From 180c0818dcdfff0b91e0ccf529e224ee983c1bc8 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Wed, 31 Jan 2024 13:08:22 +0000 Subject: [PATCH 1/4] Simple fix + remove active issues. --- .../wasm/Wasm.Build.Tests/Blazor/BuildPublishTests.cs | 2 -- .../wasm/Wasm.Build.Tests/Blazor/IcuShardingTests.cs | 2 -- src/mono/wasm/Wasm.Build.Tests/Blazor/IcuTests.cs | 3 --- src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs | 1 - .../Blazor/SimpleMultiThreadedTests.cs | 1 - .../wasm/Wasm.Build.Tests/Blazor/SimpleRunTests.cs | 3 --- .../Wasm.Build.Tests/Blazor/WorkloadRequiredTests.cs | 1 - src/mono/wasm/Wasm.Build.Tests/Common/ToolCommand.cs | 2 +- .../Wasm.Build.Tests/Templates/WasmTemplateTests.cs | 10 +++------- .../TestAppScenarios/AppSettingsTests.cs | 1 - .../TestAppScenarios/DownloadResourceProgressTests.cs | 1 - .../TestAppScenarios/LazyLoadingTests.cs | 2 -- .../TestAppScenarios/LibraryInitializerTests.cs | 2 -- .../TestAppScenarios/SatelliteLoadingTests.cs | 1 - 14 files changed, 4 insertions(+), 28 deletions(-) diff --git a/src/mono/wasm/Wasm.Build.Tests/Blazor/BuildPublishTests.cs b/src/mono/wasm/Wasm.Build.Tests/Blazor/BuildPublishTests.cs index 0157118771a66..e7be07f71c89e 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Blazor/BuildPublishTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Blazor/BuildPublishTests.cs @@ -26,7 +26,6 @@ public BuildPublishTests(ITestOutputHelper output, SharedBuildPerTestClassFixtur [Theory, TestCategory("no-workload")] [InlineData("Debug")] [InlineData("Release")] - [ActiveIssue("https://github.com/dotnet/runtime/issues/97054")] public async Task DefaultTemplate_WithoutWorkload(string config) { string id = $"blz_no_workload_{config}_{GetRandomId()}_{s_unicodeChar}"; @@ -178,7 +177,6 @@ void AssertResourcesDlls(string basePath) [Theory] [InlineData("", true)] // Default case [InlineData("false", false)] // the other case - [ActiveIssue("https://github.com/dotnet/runtime/issues/97054")] public async Task Test_WasmStripILAfterAOT(string stripILAfterAOT, bool expectILStripping) { string config = "Release"; diff --git a/src/mono/wasm/Wasm.Build.Tests/Blazor/IcuShardingTests.cs b/src/mono/wasm/Wasm.Build.Tests/Blazor/IcuShardingTests.cs index 7bfa39e3fe52b..aa19657015185 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Blazor/IcuShardingTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Blazor/IcuShardingTests.cs @@ -24,7 +24,6 @@ public IcuShardingTests(ITestOutputHelper output, SharedBuildPerTestClassFixture [InlineData("Release", "icudt.dat")] [InlineData("Debug", "icudt_CJK.dat")] [InlineData("Release", "icudt_CJK.dat")] - [ActiveIssue("https://github.com/dotnet/runtime/issues/97054")] public async Task CustomIcuFileFromRuntimePack(string config, string fileName) { string id = $"blz_customFromRuntimePack_{config}_{GetRandomId()}"; @@ -91,7 +90,6 @@ public void NonExistingCustomFileAssertError(string config, string fileName, boo [Theory] [InlineData("Debug")] [InlineData("Release")] - [ActiveIssue("https://github.com/dotnet/runtime/issues/97054")] public async Task CustomFileNotFromRuntimePackAbsolutePath(string config) { string id = $"blz_invalidCustomIcu_{config}_{GetRandomId()}"; diff --git a/src/mono/wasm/Wasm.Build.Tests/Blazor/IcuTests.cs b/src/mono/wasm/Wasm.Build.Tests/Blazor/IcuTests.cs index 7169e14b36ae4..8d8914ee195f9 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Blazor/IcuTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Blazor/IcuTests.cs @@ -26,7 +26,6 @@ public IcuTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildCo [InlineData("Release", false)] [InlineData("Release", true)] [InlineData("Release", null)] - [ActiveIssue("https://github.com/dotnet/runtime/issues/97054")] public async Task HybridWithInvariant(string config, bool? invariant) { string id = $"blz_hybrid_{config}_{GetRandomId()}"; @@ -65,7 +64,6 @@ public async Task HybridWithInvariant(string config, bool? invariant) [InlineData("Release", false)] [InlineData("Release", true)] [InlineData("Release", null)] - [ActiveIssue("https://github.com/dotnet/runtime/issues/97054")] public async Task HybridWithFullIcuFromRuntimePack(string config, bool? fullIcu) { string id = $"blz_hybrid_{config}_{GetRandomId()}"; @@ -103,7 +101,6 @@ public async Task HybridWithFullIcuFromRuntimePack(string config, bool? fullIcu) [InlineData("Release", false)] [InlineData("Release", true)] [InlineData("Release", null)] - [ActiveIssue("https://github.com/dotnet/runtime/issues/97054")] public async Task FullIcuFromRuntimePackWithInvariant(string config, bool? invariant) { string id = $"blz_hybrid_{config}_{GetRandomId()}"; diff --git a/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs b/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs index 3bd5ddd8bd02a..10717b334174b 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs @@ -30,7 +30,6 @@ public MiscTests3(ITestOutputHelper output, SharedBuildPerTestClassFixture build [InlineData("Release", /*build*/false, /*publish*/true)] [InlineData("Release", /*build*/true, /*publish*/true)] [ActiveIssue("https://github.com/dotnet/runtime/issues/87877", TestPlatforms.Windows)] - [ActiveIssue("https://github.com/dotnet/runtime/issues/97054")] public async Task WithDllImportInMainAssembly(string config, bool build, bool publish) { // Based on https://github.com/dotnet/runtime/issues/59255 diff --git a/src/mono/wasm/Wasm.Build.Tests/Blazor/SimpleMultiThreadedTests.cs b/src/mono/wasm/Wasm.Build.Tests/Blazor/SimpleMultiThreadedTests.cs index d5b96055ddc6d..c28f18a3c5746 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Blazor/SimpleMultiThreadedTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Blazor/SimpleMultiThreadedTests.cs @@ -42,7 +42,6 @@ public SimpleMultiThreadedTests(ITestOutputHelper output, SharedBuildPerTestClas // [InlineData("Debug", true)] [InlineData("Release", false)] // [InlineData("Release", true)] - [ActiveIssue("https://github.com/dotnet/runtime/issues/97054")] public async Task BlazorPublishRunTest(string config, bool aot) { string id = $"blazor_mt_{config}_{GetRandomId()}"; diff --git a/src/mono/wasm/Wasm.Build.Tests/Blazor/SimpleRunTests.cs b/src/mono/wasm/Wasm.Build.Tests/Blazor/SimpleRunTests.cs index 1d18022fd25cf..fdce8ea756f84 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Blazor/SimpleRunTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Blazor/SimpleRunTests.cs @@ -25,7 +25,6 @@ public SimpleRunTests(ITestOutputHelper output, SharedBuildPerTestClassFixture b [Theory] [InlineData("Debug")] [InlineData("Release")] - [ActiveIssue("https://github.com/dotnet/runtime/issues/97054")] public async Task BlazorBuildRunTest(string config) { string id = $"blazor_{config}_{GetRandomId()}"; @@ -40,7 +39,6 @@ public async Task BlazorBuildRunTest(string config) [InlineData("Debug", /*appendRID*/ true, /*useArtifacts*/ true)] [InlineData("Debug", /*appendRID*/ false, /*useArtifacts*/ true)] [InlineData("Debug", /*appendRID*/ false, /*useArtifacts*/ false)] - [ActiveIssue("https://github.com/dotnet/runtime/issues/97054")] public async Task BlazorBuildAndRunForDifferentOutputPaths(string config, bool appendRID, bool useArtifacts) { string id = $"{config}_{GetRandomId()}"; @@ -83,7 +81,6 @@ public async Task BlazorBuildAndRunForDifferentOutputPaths(string config, bool a [InlineData("Debug", true)] [InlineData("Release", false)] [InlineData("Release", true)] - [ActiveIssue("https://github.com/dotnet/runtime/issues/97054")] public async Task BlazorPublishRunTest(string config, bool aot) { string id = $"blazor_{config}_{GetRandomId()}"; diff --git a/src/mono/wasm/Wasm.Build.Tests/Blazor/WorkloadRequiredTests.cs b/src/mono/wasm/Wasm.Build.Tests/Blazor/WorkloadRequiredTests.cs index fba17daea55d9..deb8ad5def8e8 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Blazor/WorkloadRequiredTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Blazor/WorkloadRequiredTests.cs @@ -75,7 +75,6 @@ public static TheoryData InvariantGlobalizationTestData(bool [Theory, TestCategory("no-workload")] [MemberData(nameof(InvariantGlobalizationTestData), parameters: /*publish*/ false)] [MemberData(nameof(InvariantGlobalizationTestData), parameters: /*publish*/ true)] - [ActiveIssue("https://github.com/dotnet/runtime/issues/97054")] public async Task WorkloadNotRequiredForInvariantGlobalization(string config, bool invariant, bool publish) { string id = $"props_req_workload_{(publish ? "publish" : "build")}_{GetRandomId()}"; diff --git a/src/mono/wasm/Wasm.Build.Tests/Common/ToolCommand.cs b/src/mono/wasm/Wasm.Build.Tests/Common/ToolCommand.cs index eb2b80302b116..02f7f6c741b3c 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Common/ToolCommand.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Common/ToolCommand.cs @@ -133,7 +133,7 @@ private async Task ExecuteAsyncInternal(string executable, string CurrentProcess.BeginOutputReadLine(); CurrentProcess.BeginErrorReadLine(); await completionTask; - + CurrentProcess.Kill(); RemoveNullTerminator(output); return new CommandResult( diff --git a/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs b/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs index fe0b903c16e79..cd7e770503b47 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs @@ -268,12 +268,9 @@ void AddTestData(bool forConsole, bool runOutsideProjectDirectory) [Theory] [MemberData(nameof(TestDataForAppBundleDir))] public async Task RunWithDifferentAppBundleLocations(bool forConsole, bool runOutsideProjectDirectory, string extraProperties) - { - _ = forConsole; - await ConsoleRunWithAndThenWithoutBuildAsync("Release", extraProperties, runOutsideProjectDirectory); - // [ActiveIssue("https://github.com/dotnet/runtime/issues/97054")] - //: BrowserRunTwiceWithAndThenWithoutBuildAsync("Release", extraProperties, runOutsideProjectDirectory)); - } + => await (forConsole + ? ConsoleRunWithAndThenWithoutBuildAsync("Release", extraProperties, runOutsideProjectDirectory) + : BrowserRunTwiceWithAndThenWithoutBuildAsync("Release", extraProperties, runOutsideProjectDirectory)); private async Task BrowserRunTwiceWithAndThenWithoutBuildAsync(string config, string extraProperties = "", bool runOutsideProjectDirectory = false) { @@ -433,7 +430,6 @@ public void ConsolePublishAndRun(string config, bool aot, bool relinking) // [ActiveIssue("https://github.com/dotnet/runtime/issues/90979")] // [InlineData("", BuildTestBase.DefaultTargetFramework, "./")] // [InlineData("-f net8.0", "net8.0", "./")] - [ActiveIssue("https://github.com/dotnet/runtime/issues/97054")] public async Task BrowserBuildAndRun(string extraNewArgs, string targetFramework, string runtimeAssetsRelativePath) { string config = "Debug"; diff --git a/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/AppSettingsTests.cs b/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/AppSettingsTests.cs index aa39b1a376bc8..96f2c4ebd6a1b 100644 --- a/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/AppSettingsTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/AppSettingsTests.cs @@ -23,7 +23,6 @@ public AppSettingsTests(ITestOutputHelper output, SharedBuildPerTestClassFixture [Theory] [InlineData("Development")] [InlineData("Production")] - [ActiveIssue("https://github.com/dotnet/runtime/issues/97054")] public async Task LoadAppSettingsBasedOnApplicationEnvironment(string applicationEnvironment) { CopyTestAsset("WasmBasicTestApp", "AppSettingsTests"); diff --git a/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/DownloadResourceProgressTests.cs b/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/DownloadResourceProgressTests.cs index 5088a2e6a1160..70f9b4f1507d2 100644 --- a/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/DownloadResourceProgressTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/DownloadResourceProgressTests.cs @@ -23,7 +23,6 @@ public DownloadResourceProgressTests(ITestOutputHelper output, SharedBuildPerTes [Theory] [InlineData(false)] [InlineData(true)] - [ActiveIssue("https://github.com/dotnet/runtime/issues/97054")] public async Task DownloadProgressFinishes(bool failAssemblyDownload) { CopyTestAsset("WasmBasicTestApp", $"DownloadResourceProgressTests_{failAssemblyDownload}"); diff --git a/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/LazyLoadingTests.cs b/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/LazyLoadingTests.cs index 1603fff79e0b2..8f37a47e18860 100644 --- a/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/LazyLoadingTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/LazyLoadingTests.cs @@ -21,7 +21,6 @@ public LazyLoadingTests(ITestOutputHelper output, SharedBuildPerTestClassFixture } [Fact] - [ActiveIssue("https://github.com/dotnet/runtime/issues/97054")] public async Task LoadLazyAssemblyBeforeItIsNeeded() { CopyTestAsset("WasmBasicTestApp", "LazyLoadingTests"); @@ -32,7 +31,6 @@ public async Task LoadLazyAssemblyBeforeItIsNeeded() } [Fact] - [ActiveIssue("https://github.com/dotnet/runtime/issues/97054")] public async Task FailOnMissingLazyAssembly() { CopyTestAsset("WasmBasicTestApp", "LazyLoadingTests"); diff --git a/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/LibraryInitializerTests.cs b/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/LibraryInitializerTests.cs index 2227c05f19498..6f68a96ad1d61 100644 --- a/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/LibraryInitializerTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/LibraryInitializerTests.cs @@ -24,7 +24,6 @@ public LibraryInitializerTests(ITestOutputHelper output, SharedBuildPerTestClass } [Fact] - [ActiveIssue("https://github.com/dotnet/runtime/issues/97054")] public async Task LoadLibraryInitializer() { CopyTestAsset("WasmBasicTestApp", "LibraryInitializerTests_LoadLibraryInitializer"); @@ -38,7 +37,6 @@ public async Task LoadLibraryInitializer() } [Fact] - [ActiveIssue("https://github.com/dotnet/runtime/issues/97054")] public async Task AbortStartupOnError() { CopyTestAsset("WasmBasicTestApp", "LibraryInitializerTests_AbortStartupOnError"); diff --git a/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/SatelliteLoadingTests.cs b/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/SatelliteLoadingTests.cs index b82fae815234e..31dcb65582869 100644 --- a/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/SatelliteLoadingTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/SatelliteLoadingTests.cs @@ -24,7 +24,6 @@ public SatelliteLoadingTests(ITestOutputHelper output, SharedBuildPerTestClassFi } [Fact] - [ActiveIssue("https://github.com/dotnet/runtime/issues/97054")] public async Task LoadSatelliteAssembly() { CopyTestAsset("WasmBasicTestApp", "SatelliteLoadingTests"); From 729dd739640000167ec44925913ca34893378398 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Thu, 1 Feb 2024 13:09:01 +0000 Subject: [PATCH 2/4] Trying to repro the issue. --- src/mono/wasm/Wasm.Build.Tests/Common/ToolCommand.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/wasm/Wasm.Build.Tests/Common/ToolCommand.cs b/src/mono/wasm/Wasm.Build.Tests/Common/ToolCommand.cs index 02f7f6c741b3c..eb2b80302b116 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Common/ToolCommand.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Common/ToolCommand.cs @@ -133,7 +133,7 @@ private async Task ExecuteAsyncInternal(string executable, string CurrentProcess.BeginOutputReadLine(); CurrentProcess.BeginErrorReadLine(); await completionTask; - CurrentProcess.Kill(); + RemoveNullTerminator(output); return new CommandResult( From 9ba46188fc457b80fff32a2172f231b477cdadf9 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Thu, 1 Feb 2024 17:30:04 +0000 Subject: [PATCH 3/4] Check if with parallelisation it passes as well. --- eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml | 2 +- eng/pipelines/runtime.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml index 5e6237c9880e5..6e9adb3aac7c5 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml @@ -141,7 +141,7 @@ jobs: platforms: - browser_wasm nameSuffix: _EAT - extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) /maxcpucount:1 + extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) runAOT: false isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 8ad2dd191483c..b8940dacd30f2 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -530,7 +530,7 @@ extends: runAOT: false shouldRunSmokeOnly: false alwaysRun: ${{ variables.isRollingBuild }} - extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) /maxcpucount:2 + extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) # AOT Library tests - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml From f1afa65b6b75c030ac1d2fe0f7e5a22585a06051 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Fri, 2 Feb 2024 08:47:42 +0000 Subject: [PATCH 4/4] Revert "Check if with parallelisation it passes as well." This reverts commit 9ba46188fc457b80fff32a2172f231b477cdadf9. --- eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml | 2 +- eng/pipelines/runtime.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml index 6e9adb3aac7c5..5e6237c9880e5 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml @@ -141,7 +141,7 @@ jobs: platforms: - browser_wasm nameSuffix: _EAT - extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) + extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) /maxcpucount:1 runAOT: false isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index b8940dacd30f2..8ad2dd191483c 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -530,7 +530,7 @@ extends: runAOT: false shouldRunSmokeOnly: false alwaysRun: ${{ variables.isRollingBuild }} - extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) + extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) /maxcpucount:2 # AOT Library tests - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml