Skip to content

[wasm] Disable downlevel tests for non-main branches in non-simple WasmBuildTests #103118

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 3 commits into from
Jun 7, 2024
Merged

[wasm] Disable downlevel tests for non-main branches in non-simple WasmBuildTests #103118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83f35f4
WorkloadsTestPreviousVersions for non-simple WBT
maraf Jun 6, 2024
d151d09
Consider net8 not current
maraf Jun 6, 2024
64622dc
Conditional test data
maraf Jun 6, 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
1 change: 1 addition & 0 deletions eng/pipelines/common/templates/browser-wasm-build-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ jobs:
/p:InstallWorkloadForTesting=true
/p:WasmSkipMissingRuntimePackBuild=true
/p:PreparePackagesForWorkloadInstall=false
/p:WorkloadsTestPreviousVersions=$(workloadsTestPreviousVersionsVar)
timeoutInMinutes: 180
condition: >-
or(
Expand Down
6 changes: 4 additions & 2 deletions eng/testing/workloads-browser.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
<WorkloadIdForTesting Include="wasm-tools-net8;wasm-experimental-net8"
ManifestName="Microsoft.NET.Workload.Mono.ToolChain.net8"
Variant="net8"
Version="$(PackageVersionForWorkloadManifests)" />
Version="$(PackageVersionForWorkloadManifests)"
Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />

<WorkloadIdForTesting Include="wasm-tools-net7;wasm-experimental-net7"
ManifestName="Microsoft.NET.Workload.Mono.ToolChain.net7"
Expand All @@ -32,7 +33,8 @@
IgnoreErrors="$(WasmIgnoreNet6WorkloadInstallErrors)"
Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />

<WorkloadCombinationsToInstall Include="latest" Variants="latest;net8" />
<WorkloadCombinationsToInstall Include="latest" Variants="latest" />
<WorkloadCombinationsToInstall Include="net8" Variants="net8" Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />
<WorkloadCombinationsToInstall Include="net7" Variants="net7" Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />
<WorkloadCombinationsToInstall Include="net7+latest" Variants="net7;latest" Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />
<!--<WorkloadCombinationsToInstall Include="net6" Variants="net6" />-->
Expand Down
7 changes: 5 additions & 2 deletions eng/testing/workloads-wasi.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@
<WorkloadIdForTesting Include="wasi-experimental-net8;wasi-experimental"
ManifestName="Microsoft.NET.Workload.Mono.ToolChain.net8"
Variant="net8"
Version="$(PackageVersionForWorkloadManifests)" />
<WorkloadCombinationsToInstall Include="latest" Variants="latest;net8" />
Version="$(PackageVersionForWorkloadManifests)"
Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />

<WorkloadCombinationsToInstall Include="latest" Variants="latest" />
<WorkloadCombinationsToInstall Include="net8" Variants="net8" Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />
</ItemGroup>
</Target>
</Project>
1 change: 1 addition & 0 deletions src/libraries/sendtohelixhelp.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@
<HelixCommandPrefixEnvVarItem Include="DOTNET_CLI_TELEMETRY_OPTOUT=1" />
<HelixCommandPrefixEnvVarItem Condition="'$(TestUsingWorkloads)' == 'true'" Include="TEST_USING_WORKLOADS=true" />
<HelixCommandPrefixEnvVarItem Condition="'$(TestUsingWebcil)' == 'false'" Include="TEST_USING_WEBCIL=false" />
<HelixCommandPrefixEnvVarItem Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" Include="WORKLOADS_TEST_PREVIOUS_VERSIONS=true" />
</ItemGroup>

<PropertyGroup Condition="$(TargetRuntimeIdentifier.ToLowerInvariant().StartsWith('linux-bionic'))">
Expand Down
1 change: 1 addition & 0 deletions src/mono/wasm/Wasm.Build.Tests/Common/EnvironmentVariables.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ internal static class EnvironmentVariables
internal static readonly bool UseWebcil = Environment.GetEnvironmentVariable("USE_WEBCIL_FOR_TESTS") is "true";
internal static readonly string? SdkDirName = Environment.GetEnvironmentVariable("SDK_DIR_NAME");
internal static readonly string? WasiSdkPath = Environment.GetEnvironmentVariable("WASI_SDK_PATH");
internal static readonly bool WorkloadsTestPreviousVersions = Environment.GetEnvironmentVariable("WORKLOADS_TEST_PREVIOUS_VERSIONS") is "true";
}
}
21 changes: 15 additions & 6 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 @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using System.Threading.Tasks;
Expand Down Expand Up @@ -452,13 +453,21 @@ public void ConsolePublishAndRun(string config, bool aot, bool relinking)
Assert.Contains("args[2] = z", res.Output);
}

public static IEnumerable<object?[]> BrowserBuildAndRunTestData()
{
yield return new object?[] { "", BuildTestBase.DefaultTargetFramework, DefaultRuntimeAssetsRelativePath };
yield return new object?[] { "-f net9.0", "net9.0", DefaultRuntimeAssetsRelativePath };

if (EnvironmentVariables.WorkloadsTestPreviousVersions)
yield return new object?[] { "-f net8.0", "net8.0", DefaultRuntimeAssetsRelativePath };

// ActiveIssue("https://github.com/dotnet/runtime/issues/90979")
// yield return new object?[] { "", BuildTestBase.DefaultTargetFramework, "./" };
// yield return new object?[] { "-f net8.0", "net8.0", "./" };
}

[Theory]
[InlineData("", BuildTestBase.DefaultTargetFramework, DefaultRuntimeAssetsRelativePath)]
[InlineData("-f net9.0", "net9.0", DefaultRuntimeAssetsRelativePath)]
[InlineData("-f net8.0", "net8.0", DefaultRuntimeAssetsRelativePath)]
// [ActiveIssue("https://github.com/dotnet/runtime/issues/90979")]
// [InlineData("", BuildTestBase.DefaultTargetFramework, "./")]
// [InlineData("-f net8.0", "net8.0", "./")]
[MemberData(nameof(BrowserBuildAndRunTestData))]
public async Task BrowserBuildAndRun(string extraNewArgs, string targetFramework, string runtimeAssetsRelativePath)
{
string config = "Debug";
Expand Down