Skip to content

[wasm] Misc CI/test run improvements #61937

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
radical merged 11 commits into from
Nov 24, 2021
Merged

[wasm] Misc CI/test run improvements #61937

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
54f9ff9
[wasm] Update chrome used for testing to latest stable
radical Nov 22, 2021
26c0b6d
[wasm] Disable WBT tests failing on windows
radical Nov 21, 2021
e97a271
[wasm][aot] Don't try to run the tests, if AOT build fails
radical Nov 22, 2021
dd0a328
[wasm] Disable AOT builds on windows
radical Nov 22, 2021
e580ee4
[wasm] Disable JS Interop failing tests
radical Nov 22, 2021
80cf2c9
[wasm] Enable windows tests on manual runs
radical Nov 22, 2021
61c135d
[wasm] honor RunSmokeTestsOnly
radical Nov 23, 2021
23e77cb
Update src/libraries/sendtohelixhelp.proj
radical Nov 23, 2021
bd44d3d
[wasm][win] fix wasm/windows networking test failures
radical Nov 23, 2021
8bb6952
Merge remote-tracking branch 'origin/main' into misc-wasm-fixes
radical Nov 23, 2021
f3a7b51
Add condition to ensure that the middleware exists
radical Nov 23, 2021
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
Prev Previous commit
Next Next commit
[wasm] Disable WBT tests failing on windows 
#61725
  • Loading branch information
@radical
radical committed Nov 22, 2021
commit 26c0b6dd9e0c4a75d9217ff22606db6c967e9420
2 changes: 2 additions & 0 deletions src/tests/BuildWasmApps/Wasm.Build.Tests/MainWithArgsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -39,6 +40,7 @@ public static async System.Threading.Tasks.Task<int> 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)
Expand Down
2 changes: 2 additions & 0 deletions ...ests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/ReferenceNewAssemblyRebuildTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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)
{
Expand Down
2 changes: 2 additions & 0 deletions src/tests/BuildWasmApps/Wasm.Build.Tests/SatelliteAssembliesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 })]
Expand Down Expand Up @@ -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 })]
Expand Down
1 change: 0 additions & 1 deletion src/tests/BuildWasmApps/Wasm.Build.Tests/Wasm.Build.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetCoreAppToolCurrent)</TargetFrameworks>
<SkipTestUtilitiesReference>true</SkipTestUtilitiesReference>
<SkipXunitTrimmerDescriptor>true</SkipXunitTrimmerDescriptor>
<IsTestProject>true</IsTestProject>
<BundleXunitRunner>true</BundleXunitRunner>
Expand Down
2 changes: 2 additions & 0 deletions src/tests/BuildWasmApps/Wasm.Build.Tests/WasmBuildAppTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down