Skip to content

Commit a3bf53f

Browse files
authored
[wasm] Disable downlevel tests for non-main branches in non-simple WasmBuildTests (#103118)
1 parent 4777beb commit a3bf53f

File tree

6 files changed

+27
-10
lines changed

6 files changed

+27
-10
lines changed

eng/pipelines/common/templates/browser-wasm-build-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ jobs:
110110
/p:InstallWorkloadForTesting=true
111111
/p:WasmSkipMissingRuntimePackBuild=true
112112
/p:PreparePackagesForWorkloadInstall=false
113+
/p:WorkloadsTestPreviousVersions=$(workloadsTestPreviousVersionsVar)
113114
timeoutInMinutes: 180
114115
condition: >-
115116
or(

eng/testing/workloads-browser.targets

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
<WorkloadIdForTesting Include="wasm-tools-net8;wasm-experimental-net8"
1818
ManifestName="Microsoft.NET.Workload.Mono.ToolChain.net8"
1919
Variant="net8"
20-
Version="$(PackageVersionForWorkloadManifests)" />
20+
Version="$(PackageVersionForWorkloadManifests)"
21+
Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />
2122

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

35-
<WorkloadCombinationsToInstall Include="latest" Variants="latest;net8" />
36+
<WorkloadCombinationsToInstall Include="latest" Variants="latest" />
37+
<WorkloadCombinationsToInstall Include="net8" Variants="net8" Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />
3638
<WorkloadCombinationsToInstall Include="net7" Variants="net7" Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />
3739
<WorkloadCombinationsToInstall Include="net7+latest" Variants="net7;latest" Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />
3840
<!--<WorkloadCombinationsToInstall Include="net6" Variants="net6" />-->

eng/testing/workloads-wasi.targets

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@
1717
<WorkloadIdForTesting Include="wasi-experimental-net8;wasi-experimental"
1818
ManifestName="Microsoft.NET.Workload.Mono.ToolChain.net8"
1919
Variant="net8"
20-
Version="$(PackageVersionForWorkloadManifests)" />
21-
<WorkloadCombinationsToInstall Include="latest" Variants="latest;net8" />
20+
Version="$(PackageVersionForWorkloadManifests)"
21+
Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />
22+
23+
<WorkloadCombinationsToInstall Include="latest" Variants="latest" />
24+
<WorkloadCombinationsToInstall Include="net8" Variants="net8" Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" />
2225
</ItemGroup>
2326
</Target>
2427
</Project>

src/libraries/sendtohelixhelp.proj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@
156156
<HelixCommandPrefixEnvVarItem Include="DOTNET_CLI_TELEMETRY_OPTOUT=1" />
157157
<HelixCommandPrefixEnvVarItem Condition="'$(TestUsingWorkloads)' == 'true'" Include="TEST_USING_WORKLOADS=true" />
158158
<HelixCommandPrefixEnvVarItem Condition="'$(TestUsingWebcil)' == 'false'" Include="TEST_USING_WEBCIL=false" />
159+
<HelixCommandPrefixEnvVarItem Condition="'$(WorkloadsTestPreviousVersions)' == 'true'" Include="WORKLOADS_TEST_PREVIOUS_VERSIONS=true" />
159160
</ItemGroup>
160161

161162
<PropertyGroup Condition="$(TargetRuntimeIdentifier.ToLowerInvariant().StartsWith('linux-bionic'))">

src/mono/wasm/Wasm.Build.Tests/Common/EnvironmentVariables.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@ internal static class EnvironmentVariables
2424
internal static readonly bool UseWebcil = Environment.GetEnvironmentVariable("USE_WEBCIL_FOR_TESTS") is "true";
2525
internal static readonly string? SdkDirName = Environment.GetEnvironmentVariable("SDK_DIR_NAME");
2626
internal static readonly string? WasiSdkPath = Environment.GetEnvironmentVariable("WASI_SDK_PATH");
27+
internal static readonly bool WorkloadsTestPreviousVersions = Environment.GetEnvironmentVariable("WORKLOADS_TEST_PREVIOUS_VERSIONS") is "true";
2728
}
2829
}

src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTests.cs

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33

44
using System;
5+
using System.Collections.Generic;
56
using System.IO;
67
using System.Text;
78
using System.Threading.Tasks;
@@ -452,13 +453,21 @@ public void ConsolePublishAndRun(string config, bool aot, bool relinking)
452453
Assert.Contains("args[2] = z", res.Output);
453454
}
454455

456+
public static IEnumerable<object?[]> BrowserBuildAndRunTestData()
457+
{
458+
yield return new object?[] { "", BuildTestBase.DefaultTargetFramework, DefaultRuntimeAssetsRelativePath };
459+
yield return new object?[] { "-f net9.0", "net9.0", DefaultRuntimeAssetsRelativePath };
460+
461+
if (EnvironmentVariables.WorkloadsTestPreviousVersions)
462+
yield return new object?[] { "-f net8.0", "net8.0", DefaultRuntimeAssetsRelativePath };
463+
464+
// ActiveIssue("https://github.com/dotnet/runtime/issues/90979")
465+
// yield return new object?[] { "", BuildTestBase.DefaultTargetFramework, "./" };
466+
// yield return new object?[] { "-f net8.0", "net8.0", "./" };
467+
}
468+
455469
[Theory]
456-
[InlineData("", BuildTestBase.DefaultTargetFramework, DefaultRuntimeAssetsRelativePath)]
457-
[InlineData("-f net9.0", "net9.0", DefaultRuntimeAssetsRelativePath)]
458-
[InlineData("-f net8.0", "net8.0", DefaultRuntimeAssetsRelativePath)]
459-
// [ActiveIssue("https://github.com/dotnet/runtime/issues/90979")]
460-
// [InlineData("", BuildTestBase.DefaultTargetFramework, "./")]
461-
// [InlineData("-f net8.0", "net8.0", "./")]
470+
[MemberData(nameof(BrowserBuildAndRunTestData))]
462471
public async Task BrowserBuildAndRun(string extraNewArgs, string targetFramework, string runtimeAssetsRelativePath)
463472
{
464473
string config = "Debug";

0 commit comments

Comments
 (0)