diff options
| author | Egor Chesakov <Egor.Chesakov@microsoft.com> | 2019-01-30 22:42:49 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-30 22:42:49 -0800 |
| commit | e369d43e6630774ef73a18821488819fe5f1a596 (patch) | |
| tree | 628814e643ed37be5eea774808d004317f5f8de5 /tests | |
| parent | d644d979bf5cda2bb41b4173208943e3c8c62af2 (diff) | |
| download | coreclr-e369d43e6630774ef73a18821488819fe5f1a596.tar.gz coreclr-e369d43e6630774ef73a18821488819fe5f1a596.tar.bz2 coreclr-e369d43e6630774ef73a18821488819fe5f1a596.zip | |
Add timeoutPerTestCollection and use this to control Helix workitem timeout (#22312)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/helixpublishwitharcade.proj | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/helixpublishwitharcade.proj b/tests/helixpublishwitharcade.proj index b15863d0f8..ac41ffcc5b 100644 --- a/tests/helixpublishwitharcade.proj +++ b/tests/helixpublishwitharcade.proj @@ -22,7 +22,7 @@ <HelixSource>$(_HelixSource)</HelixSource> <HelixType>$(_HelixType)</HelixType> - <TimeoutInMinutes>$(_TimeoutInMinutes)</TimeoutInMinutes> + <TimeoutPerTestCollectionInMinutes>$(_TimeoutPerTestCollectionInMinutes)</TimeoutPerTestCollectionInMinutes> <TimeoutPerTestInMilliseconds Condition=" '$(_TimeoutPerTestInMinutes)' != '' ">$([System.TimeSpan]::FromMinutes($(_TimeoutPerTestInMinutes)).TotalMilliseconds)</TimeoutPerTestInMilliseconds> <ReadyToRun>$(_ReadyToRun)</ReadyToRun> @@ -85,6 +85,8 @@ <_XUnitRunnerDll>%CORE_ROOT%\xunit.console.dll</_XUnitRunnerDll> </PropertyGroup> + <!-- WARNING: _HelixPreCommands collection is intentionally minimal and should be kept that way. --> + <ItemGroup Condition=" '$(TargetsWindows)' == 'true' "> <_HelixPreCommands Include="set CORE_ROOT=%HELIX_CORRELATION_PAYLOAD%" /> <_HelixPreCommands Include="set RunCrossGen=true" Condition=" '$(ReadyToRun)' == 'true' " /> @@ -115,7 +117,7 @@ <PayloadDirectory>%(RootDir)%(Directory)</PayloadDirectory> <PreCommands>$(_HelixPreCommands)</PreCommands> <Command>$(_CoreRun) $(_XUnitRunnerDll) %(FileName)%(Extension) $(_XUnitRunnerArgs)</Command> - <Timeout Condition=" '$(TimeoutInMinutes)' != '' ">$([System.TimeSpan]::FromMinutes($(TimeoutInMinutes)))</Timeout> + <Timeout Condition=" '$(TimeoutPerTestCollectionInMinutes)' != '' ">$([System.TimeSpan]::FromMinutes($(TimeoutPerTestCollectionInMinutes)))</Timeout> </HelixWorkItem> </ItemGroup> </Target> |