Skip to content

[wasm] Unblock WBT that are not hanging anymore #97764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 2, 2024
Merged

[wasm] Unblock WBT that are not hanging anymore #97764

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
180c081
Simple fix + remove active issues.
ilonatommy Jan 31, 2024
729dd73
Trying to repro the issue.
ilonatommy Feb 1, 2024
9ba4618
Check if with parallelisation it passes as well.
ilonatommy Feb 1, 2024
f1afa65
Revert "Check if with parallelisation it passes as well."
ilonatommy Feb 2, 2024
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
2 changes: 0 additions & 2 deletions src/mono/wasm/Wasm.Build.Tests/Blazor/BuildPublishTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}";
Expand Down Expand Up @@ -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";
Expand Down
2 changes: 0 additions & 2 deletions src/mono/wasm/Wasm.Build.Tests/Blazor/IcuShardingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()}";
Expand Down Expand Up @@ -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()}";
Expand Down
3 changes: 0 additions & 3 deletions src/mono/wasm/Wasm.Build.Tests/Blazor/IcuTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()}";
Expand Down Expand Up @@ -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()}";
Expand Down Expand Up @@ -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()}";
Expand Down
1 change: 0 additions & 1 deletion src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests3.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/mono/wasm/Wasm.Build.Tests/Blazor/SimpleMultiThreadedTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()}";
Expand Down
3 changes: 0 additions & 3 deletions src/mono/wasm/Wasm.Build.Tests/Blazor/SimpleRunTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()}";
Expand All @@ -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()}";
Expand Down Expand Up @@ -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()}";
Expand Down
1 change: 0 additions & 1 deletion src/mono/wasm/Wasm.Build.Tests/Blazor/WorkloadRequiredTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ public static TheoryData<string, bool, bool> 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()}";
Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasm/Wasm.Build.Tests/Common/ToolCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ private async Task<CommandResult> ExecuteAsyncInternal(string executable, string
CurrentProcess.BeginOutputReadLine();
CurrentProcess.BeginErrorReadLine();
await completionTask;

CurrentProcess.Kill();
RemoveNullTerminator(output);

return new CommandResult(
Expand Down
10 changes: 3 additions & 7 deletions src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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";
Expand Down
1 change: 0 additions & 1 deletion src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/AppSettingsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
1 change: 0 additions & 1 deletion src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/DownloadResourceProgressTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}");
Expand Down
2 changes: 0 additions & 2 deletions src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/LazyLoadingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -32,7 +31,6 @@ public async Task LoadLazyAssemblyBeforeItIsNeeded()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/97054")]
public async Task FailOnMissingLazyAssembly()
{
CopyTestAsset("WasmBasicTestApp", "LazyLoadingTests");
Expand Down
2 changes: 0 additions & 2 deletions src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/LibraryInitializerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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");
Expand Down
1 change: 0 additions & 1 deletion src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/SatelliteLoadingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down