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

[browser] Disable HybridGlobalization tests on WASM #110526

Merged
merged 1 commit into from
Dec 10, 2024
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
23 changes: 0 additions & 23 deletions eng/pipelines/coreclr/perf-wasm-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -171,26 +171,3 @@ jobs:
logicalmachine: 'perftiger'
downloadSpecificBuild: ${{ parameters.downloadSpecificBuild }}
perfBranch: ${{ parameters.perfBranch }}

- ${{if or(and(ne(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'Schedule')), in(variables['Build.DefinitionName'], 'runtime-wasm-perf')) }}:
# run mono wasm blazor perf job
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml
buildConfig: release
runtimeFlavor: wasm
platforms:
- linux_x64
jobParameters:
testGroup: perf
liveLibrariesBuildConfig: Release
runtimeType: wasm
projectFile: $(Build.SourcesDirectory)/eng/testing/performance/blazor_perf.proj
runKind: blazor_scenarios
runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
# For working with a newer sdk, and previous tfm (eg. 9.0 sdk, and net8.0 tfm)
#additionalSetupParameters: '--dotnetversions 8.0.0' # passed to run-performance-job.py
logicalmachine: 'perftiger'
downloadSpecificBuild: ${{ parameters.downloadSpecificBuild }}
hybridGlobalization: True
perfBranch: ${{ parameters.perfBranch }}
31 changes: 0 additions & 31 deletions eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,37 +148,6 @@ jobs:
scenarios:
- WasmTestOnWasmtime

# Hybrid Globalization tests
- template: /eng/pipelines/common/templates/wasm-library-tests.yml
parameters:
platforms:
- browser_wasm
- browser_wasm_win
nameSuffix: _HybridGlobalization
extraBuildArgs: /p:HybridGlobalization=true
isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
alwaysRun: true
scenarios:
- WasmTestOnChrome
- WasmTestOnFirefox

# # Hybrid Globalization AOT tests
# # ActiveIssue: https://github.com/dotnet/runtime/issues/51746
# - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml
# parameters:
# platforms:
# - browser_wasm
# - browser_wasm_win
# nameSuffix: _HybridGlobalization_AOT
# extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) /p:HybridGlobalization=true
# runAOT: true
# isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }}
# isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }}
# alwaysRun: true
# scenarios:
# - WasmTestOnChrome

- ${{ if and(ne(parameters.isRollingBuild, true), ne(parameters.excludeNonLibTests, true), ne(parameters.debuggerTestsOnly, true)) }}:
# Builds only
- template: /eng/pipelines/common/templates/wasm-build-only.yml
Expand Down
23 changes: 9 additions & 14 deletions eng/testing/performance/blazor_perf.proj
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,9 @@
<Python>python3</Python>
<HelixPreCommands Condition="'$(AGENT_OS)' != 'Windows_NT'">$(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/SOD/SizeOnDisk</HelixPreCommands>

<_MSBuildArgs>/p:_TrimmerDumpDependencies=true;/p:HybridGlobalization=$(hybridGlobalization);/warnaserror:NU1602,NU1604</_MSBuildArgs>
<_MSBuildArgs>/p:_TrimmerDumpDependencies=true;/warnaserror:NU1602,NU1604</_MSBuildArgs>
<PublishArgs>--has-workload --readonly-dotnet --msbuild &quot;$(_MSBuildArgs)&quot; --msbuild-static AdditionalMonoLinkerOptions=%27&quot;%24(AdditionalMonoLinkerOptions) --dump-dependencies&quot;%27 --binlog $(LogDirectory)blazor_publish.binlog</PublishArgs>
<PublishCommand>$(EnvVars) $(Python) pre.py publish $(PublishArgs)</PublishCommand>
<!-- For non-default configurations, add the configuration to the name of the test (in the matching format), otherwise didn't add anything.
This will ensure that PowerBI's using the test name rather than the run configuration for the data continue to work properly and defaults are connected -->
<HybridGlobalizationPath></HybridGlobalizationPath>
<HybridGlobalizationPath Condition="'$(hybridGlobalization)' == 'True'"> - HybridGlobalization</HybridGlobalizationPath>
<RunConfigsString>$(HybridGlobalizationPath)</RunConfigsString>
</PropertyGroup>

<PropertyGroup Condition="'$(AGENT_OS)' == 'Windows_NT'">
Expand Down Expand Up @@ -51,48 +46,48 @@
</ItemGroup>

<ItemGroup>
<HelixWorkItem Condition="'$(hybridGlobalization)' != 'True'" Include="SOD - Minimum Blazor Template - Publish$(RunConfigsString)">
<HelixWorkItem Include="SOD - Minimum Blazor Template - Publish">
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
<!-- Specifying both illink dump msbuild properties in case illink version is not updated -->
<Command>cd $(BlazorMinDirectory) &amp;&amp; $(PublishCommand) &amp;&amp; $(Python) test.py sod --scenario-name &quot;%(Identity)&quot; $(ScenarioArgs)</Command>
</HelixWorkItem>
<HelixWorkItem Condition="'$(hybridGlobalization)' != 'True'" Include="SOD - Minimum Blazor Template - Publish - AOT$(RunConfigsString)">
<HelixWorkItem Include="SOD - Minimum Blazor Template - Publish - AOT">
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
<!-- Specifying both illink dump msbuild properties in case illink version is not updated -->
<Command>cd $(BlazorMinAOTDirectory) &amp;&amp; $(PublishCommand) &amp;&amp; $(Python) test.py sod --scenario-name &quot;%(Identity)&quot; $(ScenarioArgs)</Command>
<Timeout>00:30</Timeout>
</HelixWorkItem>
<HelixWorkItem Include="SOD - New Blazor Template - Publish$(RunConfigsString)">
<HelixWorkItem Include="SOD - New Blazor Template - Publish">
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
<Command>cd $(BlazorDirectory) &amp;&amp; $(PublishCommand) &amp;&amp; $(Python) test.py sod --scenario-name &quot;%(Identity)&quot; $(ScenarioArgs)</Command>
<PostCommands>$(Python) post.py --readonly-dotnet</PostCommands>
</HelixWorkItem>
<HelixWorkItem Include="SOD - New Blazor Template - Publish - AOT$(RunConfigsString)">
<HelixWorkItem Include="SOD - New Blazor Template - Publish - AOT">
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
<Command>cd $(BlazorAOTDirectory) &amp;&amp; $(PublishCommand) &amp;&amp; $(Python) test.py sod --scenario-name &quot;%(Identity)&quot; $(ScenarioArgs)</Command>
<PostCommands>$(Python) post.py --readonly-dotnet</PostCommands>
<Timeout>00:30</Timeout>
</HelixWorkItem>
<HelixWorkItem Include="SOD - Pizza App - Publish$(RunConfigsString)">
<HelixWorkItem Include="SOD - Pizza App - Publish">
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
<!-- Specifying both illink dump msbuild properties in case illink version is not updated -->
<Command>cd $(BlazorPizzaDirectory) &amp;&amp; $(PublishCommand) -f $(PerflabTargetFrameworks) &amp;&amp; $(Python) test.py sod --scenario-name &quot;%(Identity)&quot; --dirs $(PizzaAppPubLocation) $(ScenarioArgs)</Command>
<PostCommands>$(Python) post.py --readonly-dotnet</PostCommands>
</HelixWorkItem>
<HelixWorkItem Include="SOD - Pizza App - Publish - AOT$(RunConfigsString)">
<HelixWorkItem Include="SOD - Pizza App - Publish - AOT">
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
<!-- Specifying both illink dump msbuild properties in case illink version is not updated -->
<Command>cd $(BlazorPizzaAOTDirectory) &amp;&amp; $(PublishCommand) -f $(PerflabTargetFrameworks) &amp;&amp; $(Python) test.py sod --scenario-name &quot;%(Identity)&quot; --dirs $(PizzaAppPubLocation) $(ScenarioArgs)</Command>
<PostCommands>$(Python) post.py --readonly-dotnet</PostCommands>
<Timeout>1:00</Timeout>
</HelixWorkItem>
<HelixWorkItem Include="SOD - Localized App - Publish$(RunConfigsString)">
<HelixWorkItem Include="SOD - Localized App - Publish">
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
<Command>cd $(BlazorLocalizedDirectory) &amp;&amp; $(PublishCommand) -f $(PerflabTargetFrameworks) &amp;&amp; $(Python) test.py sod --scenario-name &quot;%(Identity)&quot; --dirs $(PizzaAppPubLocation) $(ScenarioArgs)</Command>
<PostCommands>$(Python) post.py --readonly-dotnet</PostCommands>
<Timeout>1:00</Timeout>
</HelixWorkItem>
<HelixWorkItem Include="SOD - Localized App - Publish - AOT$(RunConfigsString)">
<HelixWorkItem Include="SOD - Localized App - Publish - AOT">
<_PublishArgsWithAOT>--msbuild &quot;$(_MSBuildArgs);/p:RunAOTCompilation=true&quot;</_PublishArgsWithAOT>
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
<Command>cd $(BlazorLocalizedDirectory) &amp;&amp; $(PublishCommand) $(_PublishArgsWithAOT) -f $(PerflabTargetFrameworks) &amp;&amp; $(Python) test.py sod --scenario-name &quot;%(Identity)&quot; --dirs $(PizzaAppPubLocation) $(ScenarioArgs)</Command>
Expand Down
Loading