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][MT] longer timeouts for FS in MT, one test at the time #106078

Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetOS)' == 'browser' and '$(WasmEnableThreads)' == 'true'">
<WasmXHarnessMaxParallelThreads>1</WasmXHarnessMaxParallelThreads>
<XunitShowProgress>true</XunitShowProgress>
<!-- VSF is emulated on the UI thread and all calls are slow because they are marshaled -->
<WasmXHarnessTestsTimeout>01:15:00</WasmXHarnessTestsTimeout>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(CoreLibSharedDir)System\Runtime\CompilerServices\IsExternalInit.cs" Link="Common\System\Runtime\CompilerServices\IsExternalInit.cs" />
<Compile Include="AssemblyAttributes.cs" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
</PropertyGroup>

<PropertyGroup Condition="'$(TargetOS)' == 'browser' and '$(WasmEnableThreads)' == 'true'">
<WasmXHarnessMaxParallelThreads>1</WasmXHarnessMaxParallelThreads>
<XunitShowProgress>true</XunitShowProgress>
<!-- VSF is emulated on the UI thread and all calls are slow because they are marshaled -->
<WasmXHarnessTestsTimeout>01:15:00</WasmXHarnessTestsTimeout>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<WasmXHarnessMonoArgs>--working-dir=/test-dir</WasmXHarnessMonoArgs>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetOS)' == 'browser' and '$(WasmEnableThreads)' == 'true'">
<WasmXHarnessMaxParallelThreads>1</WasmXHarnessMaxParallelThreads>
<XunitShowProgress>true</XunitShowProgress>
<!-- VSF is emulated on the UI thread and all calls are slow because they are marshaled -->
<WasmXHarnessTestsTimeout>01:15:00</WasmXHarnessTestsTimeout>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetOS)' == 'browser' and '$(WasmEnableThreads)' == 'true'">
<WasmXHarnessMaxParallelThreads>1</WasmXHarnessMaxParallelThreads>
<XunitShowProgress>true</XunitShowProgress>
<!-- VSF is emulated on the UI thread and all calls are slow because they are marshaled -->
<WasmXHarnessTestsTimeout>01:15:00</WasmXHarnessTestsTimeout>
</PropertyGroup>
<ItemGroup>
<Compile Include="IndentedTextWriter.cs" />
<Compile Include="BinaryReader\BinaryReaderTests.cs" />
Expand Down
2 changes: 2 additions & 0 deletions src/libraries/sendtohelix-browser.targets
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,8 @@
<!-- VSF is emulated on the UI thread and all calls are slow because they are marshaled -->
<Timeout Condition="'%(FileName)' == 'System.IO.FileSystem.Tests' and '$(WasmEnableThreads)' == 'true'">01:20:00</Timeout>
<Timeout Condition="'%(FileName)' == 'System.Private.Xml.Tests' and '$(WasmEnableThreads)' == 'true'">01:20:00</Timeout>
<Timeout Condition="'%(FileName)' == 'Microsoft.VisualBasic.Core.Tests' and '$(WasmEnableThreads)' == 'true'">01:20:00</Timeout>
<Timeout Condition="'%(FileName)' == 'System.IO.Tests' and '$(WasmEnableThreads)' == 'true'">01:20:00</Timeout>
</HelixWorkItem>
</ItemGroup>

Expand Down
Loading