Skip to content

Commit

Permalink
Re-enable skiasharp WBT tests (dotnet#109232)
Browse files Browse the repository at this point in the history
* [wasm] Re-enable skiasharp WBT tests

* Disable Debug/AOT combination

That would trigger build error, because we don't support that combination
anymore

* Change order of native libs

Put NativeFileReference files after the runtime libs. This server as
a workaround of dotnet#109289

* Update llvm, emsdk and icu deps

* Revert "Change order of native libs"

This reverts commit e320fd6.
  • Loading branch information
radekdoulik committed Dec 16, 2024
1 parent 2b46f3a commit 5f5b1e4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
1 change: 0 additions & 1 deletion src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ public MiscTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildC
[InlineData("Debug", false)]
[InlineData("Release", true)]
[InlineData("Release", false)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/103566")]
public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRelink)
{
string id = $"blz_deploy_on_build_{config}_{nativeRelink}_{GetRandomId()}";
Expand Down
4 changes: 2 additions & 2 deletions src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -605,8 +605,8 @@ internal BuildPaths GetBuildPaths(BuildArgs buildArgs, bool forPublish = true)
}

protected static string GetSkiaSharpReferenceItems()
=> @"<PackageReference Include=""SkiaSharp"" Version=""2.88.6"" />
<PackageReference Include=""SkiaSharp.NativeAssets.WebAssembly"" Version=""2.88.6"" />
=> @"<PackageReference Include=""SkiaSharp"" Version=""2.88.9-preview.2.2"" />
<PackageReference Include=""SkiaSharp.NativeAssets.WebAssembly"" Version=""2.88.9-preview.2.2"" />
<NativeFileReference Include=""$(SkiaSharpStaticLibraryPath)\3.1.56\st\*.a"" />";

protected static string s_mainReturns42 = @"
Expand Down
3 changes: 1 addition & 2 deletions src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ public void ProjectWithNativeReference(BuildArgs buildArgs, RunHost host, string

[Theory]
[BuildAndRun(aot: false)]
[BuildAndRun(aot: true)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/103566")]
[BuildAndRun(aot: true, config: "Release")]
public void ProjectUsingSkiaSharp(BuildArgs buildArgs, RunHost host, string id)
{
string projectName = $"AppUsingSkiaSharp";
Expand Down

0 comments on commit 5f5b1e4

Please sign in to comment.