Skip to content
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.

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

[wasm] Enable WasmTemplateTests on CI #64589

Merged
merged 16 commits into from
Feb 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions eng/pipelines/common/evaluate-default-paths.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ jobs:
- src/mono/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/*
- src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/*
- src/mono/mono/*
- eng/testing/scenarios/BuildWasmAppsJobsList.txt
- eng/Version.Details.xml
- src/mono/wasm/emscripten-version.txt
- subset: wasmdebuggertests
include:
- src/mono/wasm/debugger/*
Expand Down
1 change: 1 addition & 0 deletions eng/testing/scenarios/BuildWasmAppsJobsList.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ Wasm.Build.Tests.SatelliteAssembliesTests
Wasm.Build.Tests.WasmBuildAppTest
Wasm.Build.Tests.WasmNativeDefaultsTests
Wasm.Build.Tests.WorkloadTests
Wasm.Build.Tests.WasmTemplateTests
13 changes: 7 additions & 6 deletions src/tests/BuildWasmApps/Wasm.Build.Tests/WasmTemplateTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public WasmTemplateTests(ITestOutputHelper output, SharedBuildPerTestClassFixtur
{
}

[Theory]
[ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
[InlineData("Debug")]
[InlineData("Release")]
public void BrowserBuildThenPublish(string config)
Expand Down Expand Up @@ -61,7 +61,7 @@ public void BrowserBuildThenPublish(string config)
UseCache: false));
}

[Theory]
[ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
[InlineData("Debug")]
[InlineData("Release")]
public void ConsoleBuildThenPublish(string config)
Expand All @@ -76,10 +76,10 @@ public void ConsoleBuildThenPublish(string config)
BuildProject(buildArgs,
id: id,
new BuildProjectOptions(
DotnetWasmFromRuntimePack: false,
DotnetWasmFromRuntimePack: true,
CreateProject: false,
HasV8Script: false,
MainJS: "main.mjs",
MainJS: "main.cjs",
Publish: false,
TargetFramework: "net7.0"
));
Expand All @@ -92,13 +92,14 @@ public void ConsoleBuildThenPublish(string config)
_testOutput.WriteLine($"{Environment.NewLine}Publishing with no changes ..{Environment.NewLine}");
Console.WriteLine($"{Environment.NewLine}Publishing with no changes ..{Environment.NewLine}");

bool expectRelinking = config == "Release";
BuildProject(buildArgs,
id: id,
new BuildProjectOptions(
DotnetWasmFromRuntimePack: false,
DotnetWasmFromRuntimePack: !expectRelinking,
CreateProject: false,
HasV8Script: false,
MainJS: "main.mjs",
MainJS: "main.cjs",
Publish: true,
TargetFramework: "net7.0",
UseCache: false));
Expand Down